Mercurial Repositories > eric / changeset
changeset
Merged with default branch to prepare a new release.
Sun, 02 Feb 2020 11:27:46 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 02 Feb 2020 11:27:46 +0100
- branch
- maintenance
- changeset 7382
- df744f939cca
- parent 7363
- 7fe343f85860 (current diff)
- parent 7381
- cee375d46f2f (diff)
- child 7383
- 6c4a12fa7146
Merged with default branch to prepare a new release.
--- a/eric6/APIs/Python3/eric6.api Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/APIs/Python3/eric6.api Sun Feb 02 11:27:46 2020 +0100 @@ -383,6 +383,7 @@ eric6.DebugClients.Python.PyProfile.PyProfile.save?4() eric6.DebugClients.Python.PyProfile.PyProfile.trace_dispatch_call?4(frame, t) eric6.DebugClients.Python.PyProfile.PyProfile?1(basename, timer=None, bias=None) +eric6.DebugClients.Python.ThreadExtension.DummyThreadWrapper?1(*args, **kwargs) eric6.DebugClients.Python.ThreadExtension.QThreadWrapper?1(*args, **kwargs) eric6.DebugClients.Python.ThreadExtension.ThreadExtension._bootstrap?5(run) eric6.DebugClients.Python.ThreadExtension.ThreadExtension._bootstrapQThread?5(run) @@ -4455,13 +4456,9 @@ eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.on_tagCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_categoryCombo_activated?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_rxEdit_textChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.on_verifyButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.start?4(path) @@ -4481,11 +4478,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog.HgAddSubrepositoryDialog.on_urlEdit_textChanged?4(p0) eric6.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog.HgAddSubrepositoryDialog?1(projectPath, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.start?4(fn) eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog.HgArchiveDialog.getData?4() @@ -4524,21 +4517,13 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.INCOMING?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.OUTGOING?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog.start?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.HgBookmarksInOutDialog?1(vcs, mode, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested?4(pos) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_refreshButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog.start?4(path, bookmarksList) eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.HgBookmarksListDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.HgBranchInputDialog.getData?4() @@ -4589,17 +4574,13 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.FilenameRole?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemDoubleClicked?4(item, column) eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemSelectionChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_editButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_reMergeButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_refreshButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_resolvedButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_unresolvedButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.show?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.start?4(path) @@ -4608,13 +4589,9 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetPicker_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent=None, move=False) eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.hasAddOrDelete?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.normalExit?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.normalExitWithoutErrors?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir=None, showArgs=True, environment=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog?1(text, hg=None, useClient=True, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.closeEvent?4(e) @@ -4676,7 +4653,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.TagsColumn?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.closeEvent?4(e) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.col2x?4(radius) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_branchCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffSelectLabel_linkActivated?4(link) @@ -4686,18 +4662,15 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findNextButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findPrevButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fromDate_dateChanged?4(date) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_input_returnPressed?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_logTree_itemSelectionChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_modeComboBox_currentIndexChanged?4(index) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_nextButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_refreshButton_clicked?4(addNext=False) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_rxEdit_returnPressed?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_rxEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_saveLabel_linkActivated?4(link) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sbsSelectLabel_linkActivated?4(link) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_upButton_clicked?4() @@ -4765,12 +4738,8 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog.closeEvent?4(e) eric6.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog?1(vcs, path, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_refreshButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusFilterCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemSelectionChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.show?4() @@ -4786,12 +4755,8 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog.start?4(path, mq=False, largefiles=False) eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_refreshButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_tagList_customContextMenuRequested?4(pos) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.start?4(path, tags, tagsList, allTagsList) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog?1(vcs, parent=None) @@ -4944,11 +4909,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListAllGuardsDialog.HgQueuesListAllGuardsDialog.start?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListAllGuardsDialog.HgQueuesListAllGuardsDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog.start?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.HgQueuesListDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListGuardsDialog.HgQueuesListGuardsDialog.closeEvent?4(e) @@ -5046,12 +5007,8 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.MessageColumn?7 eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.NameColumn?7 eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_passwordCheckBox_toggled?4(isOn) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_refreshButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_currentItemChanged?4(current, previous) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_customContextMenuRequested?4(pos) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.show?4()
--- a/eric6/APIs/Python3/eric6.bas Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/APIs/Python3/eric6.bas Sun Feb 02 11:27:46 2020 +0100 @@ -158,6 +158,7 @@ DownloadManager QDialog Ui_DownloadManager DownloadManagerButton E5ToolButton DownloadModel QAbstractListModel +DummyThreadWrapper ThreadWrapper module._DummyThread DuplicateParamError Exception E5Action QAction E5AnimatedWidget QWidget
--- a/eric6/DebugClients/Python/ThreadExtension.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/DebugClients/Python/ThreadExtension.py Sun Feb 02 11:27:46 2020 +0100 @@ -358,6 +358,19 @@ else: module.Timer = TimerWrapper + # Special handling of threading._DummyThread + class DummyThreadWrapper(module._DummyThread, ThreadWrapper): + """ + Wrapper class for threading._DummyThread. + """ + def __init__(self, *args, **kwargs): + """ + Constructor + """ + super(DummyThreadWrapper, self).__init__(*args, **kwargs) + + module._DummyThread = DummyThreadWrapper + # Add hook for *.QThread elif (fullname in ['PyQt4.QtCore', 'PyQt5.QtCore', 'PySide.QtCore', 'PySide2.QtCore'] and
--- a/eric6/Debugger/VariablesViewer.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Debugger/VariablesViewer.py Sun Feb 02 11:27:46 2020 +0100 @@ -690,7 +690,10 @@ indentation = 0 # Check if text is longer than available space fontMetrics = QFontMetrics(self.treeView.font()) - textSize = fontMetrics.width(tooltip) + try: + textSize = fontMetrics.horizontalAdvance(tooltip) + except AttributeError: + textSize = fontMetrics.width(tooltip) textSize += indentation + 5 # How to determine border size? header = self.treeView.header() if textSize >= header.sectionSize(column):
--- a/eric6/Documentation/Help/source.qhp Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Help/source.qhp Sun Feb 02 11:27:46 2020 +0100 @@ -3764,6 +3764,8 @@ <keyword name="DownloadModel.removeRows" id="DownloadModel.removeRows" ref="eric6.WebBrowser.Download.DownloadModel.html#DownloadModel.removeRows" /> <keyword name="DownloadModel.rowCount" id="DownloadModel.rowCount" ref="eric6.WebBrowser.Download.DownloadModel.html#DownloadModel.rowCount" /> <keyword name="DownloadUtilities (Module)" id="DownloadUtilities (Module)" ref="eric6.WebBrowser.Download.DownloadUtilities.html" /> + <keyword name="DummyThreadWrapper" id="DummyThreadWrapper" ref="eric6.DebugClients.Python.ThreadExtension.html#DummyThreadWrapper" /> + <keyword name="DummyThreadWrapper (Constructor)" id="DummyThreadWrapper (Constructor)" ref="eric6.DebugClients.Python.ThreadExtension.html#DummyThreadWrapper.__init__" /> <keyword name="DuplicateParamError" id="DuplicateParamError" ref="eric6.E5Network.E5RFC6266.html#DuplicateParamError" /> <keyword name="E5Action" id="E5Action" ref="eric6.E5Gui.E5Action.html#E5Action" /> <keyword name="E5Action (Constructor)" id="E5Action (Constructor)" ref="eric6.E5Gui.E5Action.html#E5Action.__init__" /> @@ -7083,6 +7085,7 @@ <keyword name="Hg" id="Hg" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> <keyword name="Hg.__checkDefaults" id="Hg.__checkDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__checkDefaults" /> + <keyword name="Hg.__createClient" id="Hg.__createClient" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__createClient" /> <keyword name="Hg.__getExtensionsInfo" id="Hg.__getExtensionsInfo" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getExtensionsInfo" /> <keyword name="Hg.__getInOutBookmarks" id="Hg.__getInOutBookmarks" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getInOutBookmarks" /> <keyword name="Hg.__getMostRecentCommitMessage" id="Hg.__getMostRecentCommitMessage" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getMostRecentCommitMessage" /> @@ -7208,18 +7211,11 @@ <keyword name="HgAnnotateDialog (Module)" id="HgAnnotateDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html" /> <keyword name="HgAnnotateDialog.__finish" id="HgAnnotateDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__finish" /> <keyword name="HgAnnotateDialog.__generateItem" id="HgAnnotateDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__generateItem" /> - <keyword name="HgAnnotateDialog.__procFinished" id="HgAnnotateDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__procFinished" /> <keyword name="HgAnnotateDialog.__processOutputLine" id="HgAnnotateDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__processOutputLine" /> - <keyword name="HgAnnotateDialog.__readStderr" id="HgAnnotateDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__readStderr" /> - <keyword name="HgAnnotateDialog.__readStdout" id="HgAnnotateDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__readStdout" /> <keyword name="HgAnnotateDialog.__resizeColumns" id="HgAnnotateDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__resizeColumns" /> <keyword name="HgAnnotateDialog.__showError" id="HgAnnotateDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__showError" /> <keyword name="HgAnnotateDialog.closeEvent" id="HgAnnotateDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.closeEvent" /> - <keyword name="HgAnnotateDialog.keyPressEvent" id="HgAnnotateDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.keyPressEvent" /> <keyword name="HgAnnotateDialog.on_buttonBox_clicked" id="HgAnnotateDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.on_buttonBox_clicked" /> - <keyword name="HgAnnotateDialog.on_input_returnPressed" id="HgAnnotateDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.on_input_returnPressed" /> - <keyword name="HgAnnotateDialog.on_passwordCheckBox_toggled" id="HgAnnotateDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgAnnotateDialog.on_sendButton_clicked" id="HgAnnotateDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.on_sendButton_clicked" /> <keyword name="HgAnnotateDialog.start" id="HgAnnotateDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.start" /> <keyword name="HgArchiveDialog" id="HgArchiveDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog.html#HgArchiveDialog" /> <keyword name="HgArchiveDialog (Constructor)" id="HgArchiveDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgArchiveDialog.html#HgArchiveDialog.__init__" /> @@ -7269,19 +7265,12 @@ <keyword name="HgBookmarksInOutDialog (Module)" id="HgBookmarksInOutDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html" /> <keyword name="HgBookmarksInOutDialog.__finish" id="HgBookmarksInOutDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__finish" /> <keyword name="HgBookmarksInOutDialog.__generateItem" id="HgBookmarksInOutDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__generateItem" /> - <keyword name="HgBookmarksInOutDialog.__procFinished" id="HgBookmarksInOutDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__procFinished" /> <keyword name="HgBookmarksInOutDialog.__processOutputLine" id="HgBookmarksInOutDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__processOutputLine" /> - <keyword name="HgBookmarksInOutDialog.__readStderr" id="HgBookmarksInOutDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStderr" /> - <keyword name="HgBookmarksInOutDialog.__readStdout" id="HgBookmarksInOutDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStdout" /> <keyword name="HgBookmarksInOutDialog.__resizeColumns" id="HgBookmarksInOutDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resizeColumns" /> <keyword name="HgBookmarksInOutDialog.__resort" id="HgBookmarksInOutDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resort" /> <keyword name="HgBookmarksInOutDialog.__showError" id="HgBookmarksInOutDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__showError" /> <keyword name="HgBookmarksInOutDialog.closeEvent" id="HgBookmarksInOutDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.closeEvent" /> - <keyword name="HgBookmarksInOutDialog.keyPressEvent" id="HgBookmarksInOutDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.keyPressEvent" /> <keyword name="HgBookmarksInOutDialog.on_buttonBox_clicked" id="HgBookmarksInOutDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_buttonBox_clicked" /> - <keyword name="HgBookmarksInOutDialog.on_input_returnPressed" id="HgBookmarksInOutDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_input_returnPressed" /> - <keyword name="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" id="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgBookmarksInOutDialog.on_sendButton_clicked" id="HgBookmarksInOutDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_sendButton_clicked" /> <keyword name="HgBookmarksInOutDialog.start" id="HgBookmarksInOutDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.start" /> <keyword name="HgBookmarksListDialog" id="HgBookmarksListDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog" /> <keyword name="HgBookmarksListDialog (Constructor)" id="HgBookmarksListDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__init__" /> @@ -7289,25 +7278,18 @@ <keyword name="HgBookmarksListDialog.__deleteBookmark" id="HgBookmarksListDialog.__deleteBookmark" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__deleteBookmark" /> <keyword name="HgBookmarksListDialog.__finish" id="HgBookmarksListDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__finish" /> <keyword name="HgBookmarksListDialog.__generateItem" id="HgBookmarksListDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__generateItem" /> - <keyword name="HgBookmarksListDialog.__procFinished" id="HgBookmarksListDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__procFinished" /> <keyword name="HgBookmarksListDialog.__processOutputLine" id="HgBookmarksListDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__processOutputLine" /> <keyword name="HgBookmarksListDialog.__pullBookmark" id="HgBookmarksListDialog.__pullBookmark" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__pullBookmark" /> <keyword name="HgBookmarksListDialog.__pushBookmark" id="HgBookmarksListDialog.__pushBookmark" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__pushBookmark" /> - <keyword name="HgBookmarksListDialog.__readStderr" id="HgBookmarksListDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStderr" /> - <keyword name="HgBookmarksListDialog.__readStdout" id="HgBookmarksListDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStdout" /> <keyword name="HgBookmarksListDialog.__renameBookmark" id="HgBookmarksListDialog.__renameBookmark" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__renameBookmark" /> <keyword name="HgBookmarksListDialog.__resizeColumns" id="HgBookmarksListDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__resizeColumns" /> <keyword name="HgBookmarksListDialog.__resort" id="HgBookmarksListDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__resort" /> <keyword name="HgBookmarksListDialog.__showError" id="HgBookmarksListDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__showError" /> <keyword name="HgBookmarksListDialog.__switchTo" id="HgBookmarksListDialog.__switchTo" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.__switchTo" /> <keyword name="HgBookmarksListDialog.closeEvent" id="HgBookmarksListDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.closeEvent" /> - <keyword name="HgBookmarksListDialog.keyPressEvent" id="HgBookmarksListDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.keyPressEvent" /> <keyword name="HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested" id="HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested" /> <keyword name="HgBookmarksListDialog.on_buttonBox_clicked" id="HgBookmarksListDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_buttonBox_clicked" /> - <keyword name="HgBookmarksListDialog.on_input_returnPressed" id="HgBookmarksListDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_input_returnPressed" /> - <keyword name="HgBookmarksListDialog.on_passwordCheckBox_toggled" id="HgBookmarksListDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_passwordCheckBox_toggled" /> <keyword name="HgBookmarksListDialog.on_refreshButton_clicked" id="HgBookmarksListDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_refreshButton_clicked" /> - <keyword name="HgBookmarksListDialog.on_sendButton_clicked" id="HgBookmarksListDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.on_sendButton_clicked" /> <keyword name="HgBookmarksListDialog.start" id="HgBookmarksListDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html#HgBookmarksListDialog.start" /> <keyword name="HgBranchInputDialog" id="HgBranchInputDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html#HgBranchInputDialog" /> <keyword name="HgBranchInputDialog (Constructor)" id="HgBranchInputDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgBranchInputDialog.html#HgBranchInputDialog.__init__" /> @@ -7378,25 +7360,18 @@ <keyword name="HgConflictsListDialog.__finish" id="HgConflictsListDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__finish" /> <keyword name="HgConflictsListDialog.__generateItem" id="HgConflictsListDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__generateItem" /> <keyword name="HgConflictsListDialog.__getEntries" id="HgConflictsListDialog.__getEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__getEntries" /> - <keyword name="HgConflictsListDialog.__procFinished" id="HgConflictsListDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__procFinished" /> <keyword name="HgConflictsListDialog.__processOutputLine" id="HgConflictsListDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__processOutputLine" /> - <keyword name="HgConflictsListDialog.__readStderr" id="HgConflictsListDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__readStderr" /> - <keyword name="HgConflictsListDialog.__readStdout" id="HgConflictsListDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__readStdout" /> <keyword name="HgConflictsListDialog.__resizeColumns" id="HgConflictsListDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__resizeColumns" /> <keyword name="HgConflictsListDialog.__resort" id="HgConflictsListDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__resort" /> <keyword name="HgConflictsListDialog.__showError" id="HgConflictsListDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__showError" /> <keyword name="HgConflictsListDialog.closeEvent" id="HgConflictsListDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.closeEvent" /> - <keyword name="HgConflictsListDialog.keyPressEvent" id="HgConflictsListDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.keyPressEvent" /> <keyword name="HgConflictsListDialog.on_buttonBox_clicked" id="HgConflictsListDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_buttonBox_clicked" /> <keyword name="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" id="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_conflictsList_itemDoubleClicked" /> <keyword name="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" id="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_conflictsList_itemSelectionChanged" /> <keyword name="HgConflictsListDialog.on_editButton_clicked" id="HgConflictsListDialog.on_editButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_editButton_clicked" /> - <keyword name="HgConflictsListDialog.on_input_returnPressed" id="HgConflictsListDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_input_returnPressed" /> - <keyword name="HgConflictsListDialog.on_passwordCheckBox_toggled" id="HgConflictsListDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_passwordCheckBox_toggled" /> <keyword name="HgConflictsListDialog.on_reMergeButton_clicked" id="HgConflictsListDialog.on_reMergeButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_reMergeButton_clicked" /> <keyword name="HgConflictsListDialog.on_refreshButton_clicked" id="HgConflictsListDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_refreshButton_clicked" /> <keyword name="HgConflictsListDialog.on_resolvedButton_clicked" id="HgConflictsListDialog.on_resolvedButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_resolvedButton_clicked" /> - <keyword name="HgConflictsListDialog.on_sendButton_clicked" id="HgConflictsListDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_sendButton_clicked" /> <keyword name="HgConflictsListDialog.on_unresolvedButton_clicked" id="HgConflictsListDialog.on_unresolvedButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_unresolvedButton_clicked" /> <keyword name="HgConflictsListDialog.show" id="HgConflictsListDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.show" /> <keyword name="HgConflictsListDialog.start" id="HgConflictsListDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.start" /> @@ -7409,19 +7384,12 @@ <keyword name="HgDialog (Constructor)" id="HgDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__init__" /> <keyword name="HgDialog (Module)" id="HgDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> <keyword name="HgDialog.__finish" id="HgDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__finish" /> - <keyword name="HgDialog.__procFinished" id="HgDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__procFinished" /> - <keyword name="HgDialog.__readStderr" id="HgDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__readStderr" /> - <keyword name="HgDialog.__readStdout" id="HgDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__readStdout" /> <keyword name="HgDialog.__showError" id="HgDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__showError" /> <keyword name="HgDialog.__showOutput" id="HgDialog.__showOutput" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__showOutput" /> <keyword name="HgDialog.hasAddOrDelete" id="HgDialog.hasAddOrDelete" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.hasAddOrDelete" /> - <keyword name="HgDialog.keyPressEvent" id="HgDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.keyPressEvent" /> <keyword name="HgDialog.normalExit" id="HgDialog.normalExit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.normalExit" /> <keyword name="HgDialog.normalExitWithoutErrors" id="HgDialog.normalExitWithoutErrors" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.normalExitWithoutErrors" /> <keyword name="HgDialog.on_buttonBox_clicked" id="HgDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_buttonBox_clicked" /> - <keyword name="HgDialog.on_input_returnPressed" id="HgDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_input_returnPressed" /> - <keyword name="HgDialog.on_passwordCheckBox_toggled" id="HgDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgDialog.on_sendButton_clicked" id="HgDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.on_sendButton_clicked" /> <keyword name="HgDialog.startProcess" id="HgDialog.startProcess" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.startProcess" /> <keyword name="HgDiffDialog" id="HgDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html#HgDiffDialog" /> <keyword name="HgDiffDialog (Constructor)" id="HgDiffDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html#HgDiffDialog.__init__" /> @@ -7441,8 +7409,6 @@ <keyword name="HgDiffGenerator.__getVersionArg" id="HgDiffGenerator.__getVersionArg" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.__getVersionArg" /> <keyword name="HgDiffGenerator.__processFileLine" id="HgDiffGenerator.__processFileLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.__processFileLine" /> <keyword name="HgDiffGenerator.__processOutputLine" id="HgDiffGenerator.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.__processOutputLine" /> - <keyword name="HgDiffGenerator.__readStderr" id="HgDiffGenerator.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.__readStderr" /> - <keyword name="HgDiffGenerator.__readStdout" id="HgDiffGenerator.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.__readStdout" /> <keyword name="HgDiffGenerator.getResult" id="HgDiffGenerator.getResult" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.getResult" /> <keyword name="HgDiffGenerator.start" id="HgDiffGenerator.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.start" /> <keyword name="HgDiffGenerator.stopProcess" id="HgDiffGenerator.stopProcess" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html#HgDiffGenerator.stopProcess" /> @@ -7502,21 +7468,14 @@ <keyword name="HgGpgSignaturesDialog.__filterSignatures" id="HgGpgSignaturesDialog.__filterSignatures" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__filterSignatures" /> <keyword name="HgGpgSignaturesDialog.__finish" id="HgGpgSignaturesDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__finish" /> <keyword name="HgGpgSignaturesDialog.__generateItem" id="HgGpgSignaturesDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__generateItem" /> - <keyword name="HgGpgSignaturesDialog.__procFinished" id="HgGpgSignaturesDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__procFinished" /> <keyword name="HgGpgSignaturesDialog.__processOutputLine" id="HgGpgSignaturesDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__processOutputLine" /> - <keyword name="HgGpgSignaturesDialog.__readStderr" id="HgGpgSignaturesDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__readStderr" /> - <keyword name="HgGpgSignaturesDialog.__readStdout" id="HgGpgSignaturesDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__readStdout" /> <keyword name="HgGpgSignaturesDialog.__resizeColumns" id="HgGpgSignaturesDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__resizeColumns" /> <keyword name="HgGpgSignaturesDialog.__resort" id="HgGpgSignaturesDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__resort" /> <keyword name="HgGpgSignaturesDialog.__showError" id="HgGpgSignaturesDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.__showError" /> <keyword name="HgGpgSignaturesDialog.closeEvent" id="HgGpgSignaturesDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.closeEvent" /> - <keyword name="HgGpgSignaturesDialog.keyPressEvent" id="HgGpgSignaturesDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.keyPressEvent" /> <keyword name="HgGpgSignaturesDialog.on_buttonBox_clicked" id="HgGpgSignaturesDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_buttonBox_clicked" /> <keyword name="HgGpgSignaturesDialog.on_categoryCombo_activated" id="HgGpgSignaturesDialog.on_categoryCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_categoryCombo_activated" /> - <keyword name="HgGpgSignaturesDialog.on_input_returnPressed" id="HgGpgSignaturesDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_input_returnPressed" /> - <keyword name="HgGpgSignaturesDialog.on_passwordCheckBox_toggled" id="HgGpgSignaturesDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_passwordCheckBox_toggled" /> <keyword name="HgGpgSignaturesDialog.on_rxEdit_textChanged" id="HgGpgSignaturesDialog.on_rxEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_rxEdit_textChanged" /> - <keyword name="HgGpgSignaturesDialog.on_sendButton_clicked" id="HgGpgSignaturesDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_sendButton_clicked" /> <keyword name="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" id="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" /> <keyword name="HgGpgSignaturesDialog.on_verifyButton_clicked" id="HgGpgSignaturesDialog.on_verifyButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_verifyButton_clicked" /> <keyword name="HgGpgSignaturesDialog.start" id="HgGpgSignaturesDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.start" /> @@ -7616,13 +7575,10 @@ <keyword name="HgLogBrowserDialog.__modifyForLargeFiles" id="HgLogBrowserDialog.__modifyForLargeFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__modifyForLargeFiles" /> <keyword name="HgLogBrowserDialog.__phaseActTriggered" id="HgLogBrowserDialog.__phaseActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__phaseActTriggered" /> <keyword name="HgLogBrowserDialog.__prepareFieldSearch" id="HgLogBrowserDialog.__prepareFieldSearch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__prepareFieldSearch" /> - <keyword name="HgLogBrowserDialog.__procFinished" id="HgLogBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__procFinished" /> <keyword name="HgLogBrowserDialog.__processBuffer" id="HgLogBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__processBuffer" /> <keyword name="HgLogBrowserDialog.__pullActTriggered" id="HgLogBrowserDialog.__pullActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pullActTriggered" /> <keyword name="HgLogBrowserDialog.__pushActTriggered" id="HgLogBrowserDialog.__pushActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pushActTriggered" /> <keyword name="HgLogBrowserDialog.__pushAllActTriggered" id="HgLogBrowserDialog.__pushAllActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pushAllActTriggered" /> - <keyword name="HgLogBrowserDialog.__readStderr" id="HgLogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStderr" /> - <keyword name="HgLogBrowserDialog.__readStdout" id="HgLogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStdout" /> <keyword name="HgLogBrowserDialog.__reloadGeometry" id="HgLogBrowserDialog.__reloadGeometry" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__reloadGeometry" /> <keyword name="HgLogBrowserDialog.__resetUI" id="HgLogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resetUI" /> <keyword name="HgLogBrowserDialog.__resizeColumnsFiles" id="HgLogBrowserDialog.__resizeColumnsFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsFiles" /> @@ -7642,7 +7598,6 @@ <keyword name="HgLogBrowserDialog.__updateToolMenuActions" id="HgLogBrowserDialog.__updateToolMenuActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateToolMenuActions" /> <keyword name="HgLogBrowserDialog.closeEvent" id="HgLogBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.closeEvent" /> <keyword name="HgLogBrowserDialog.col2x" id="HgLogBrowserDialog.col2x" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.col2x" /> - <keyword name="HgLogBrowserDialog.keyPressEvent" id="HgLogBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.keyPressEvent" /> <keyword name="HgLogBrowserDialog.on_branchCombo_activated" id="HgLogBrowserDialog.on_branchCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_branchCombo_activated" /> <keyword name="HgLogBrowserDialog.on_buttonBox_clicked" id="HgLogBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_buttonBox_clicked" /> <keyword name="HgLogBrowserDialog.on_diffSelectLabel_linkActivated" id="HgLogBrowserDialog.on_diffSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffSelectLabel_linkActivated" /> @@ -7652,18 +7607,15 @@ <keyword name="HgLogBrowserDialog.on_findNextButton_clicked" id="HgLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findNextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_findPrevButton_clicked" id="HgLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findPrevButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fromDate_dateChanged" id="HgLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fromDate_dateChanged" /> - <keyword name="HgLogBrowserDialog.on_input_returnPressed" id="HgLogBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_input_returnPressed" /> <keyword name="HgLogBrowserDialog.on_logTree_currentItemChanged" id="HgLogBrowserDialog.on_logTree_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_logTree_currentItemChanged" /> <keyword name="HgLogBrowserDialog.on_logTree_itemSelectionChanged" id="HgLogBrowserDialog.on_logTree_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_logTree_itemSelectionChanged" /> <keyword name="HgLogBrowserDialog.on_modeComboBox_currentIndexChanged" id="HgLogBrowserDialog.on_modeComboBox_currentIndexChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_modeComboBox_currentIndexChanged" /> <keyword name="HgLogBrowserDialog.on_nextButton_clicked" id="HgLogBrowserDialog.on_nextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_nextButton_clicked" /> - <keyword name="HgLogBrowserDialog.on_passwordCheckBox_toggled" id="HgLogBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_passwordCheckBox_toggled" /> <keyword name="HgLogBrowserDialog.on_refreshButton_clicked" id="HgLogBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_refreshButton_clicked" /> <keyword name="HgLogBrowserDialog.on_rxEdit_returnPressed" id="HgLogBrowserDialog.on_rxEdit_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_rxEdit_returnPressed" /> <keyword name="HgLogBrowserDialog.on_rxEdit_textChanged" id="HgLogBrowserDialog.on_rxEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_rxEdit_textChanged" /> <keyword name="HgLogBrowserDialog.on_saveLabel_linkActivated" id="HgLogBrowserDialog.on_saveLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_saveLabel_linkActivated" /> <keyword name="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" id="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" /> - <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> <keyword name="HgLogBrowserDialog.on_stopCheckBox_clicked" id="HgLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="HgLogBrowserDialog.on_toDate_dateChanged" id="HgLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_toDate_dateChanged" /> <keyword name="HgLogBrowserDialog.on_upButton_clicked" id="HgLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_upButton_clicked" /> @@ -7838,9 +7790,6 @@ <keyword name="HgQueuesHeaderDialog (Constructor)" id="HgQueuesHeaderDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__init__" /> <keyword name="HgQueuesHeaderDialog (Module)" id="HgQueuesHeaderDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html" /> <keyword name="HgQueuesHeaderDialog.__finish" id="HgQueuesHeaderDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__finish" /> - <keyword name="HgQueuesHeaderDialog.__procFinished" id="HgQueuesHeaderDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__procFinished" /> - <keyword name="HgQueuesHeaderDialog.__readStderr" id="HgQueuesHeaderDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__readStderr" /> - <keyword name="HgQueuesHeaderDialog.__readStdout" id="HgQueuesHeaderDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__readStdout" /> <keyword name="HgQueuesHeaderDialog.__showError" id="HgQueuesHeaderDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__showError" /> <keyword name="HgQueuesHeaderDialog.__showOutput" id="HgQueuesHeaderDialog.__showOutput" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.__showOutput" /> <keyword name="HgQueuesHeaderDialog.closeEvent" id="HgQueuesHeaderDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html#HgQueuesHeaderDialog.closeEvent" /> @@ -7858,19 +7807,12 @@ <keyword name="HgQueuesListDialog.__getSeries" id="HgQueuesListDialog.__getSeries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getSeries" /> <keyword name="HgQueuesListDialog.__getTop" id="HgQueuesListDialog.__getTop" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__getTop" /> <keyword name="HgQueuesListDialog.__markTopItem" id="HgQueuesListDialog.__markTopItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__markTopItem" /> - <keyword name="HgQueuesListDialog.__procFinished" id="HgQueuesListDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__procFinished" /> <keyword name="HgQueuesListDialog.__processOutputLine" id="HgQueuesListDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__processOutputLine" /> - <keyword name="HgQueuesListDialog.__readStderr" id="HgQueuesListDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__readStderr" /> - <keyword name="HgQueuesListDialog.__readStdout" id="HgQueuesListDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__readStdout" /> <keyword name="HgQueuesListDialog.__resizeColumns" id="HgQueuesListDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__resizeColumns" /> <keyword name="HgQueuesListDialog.__resort" id="HgQueuesListDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__resort" /> <keyword name="HgQueuesListDialog.__showError" id="HgQueuesListDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.__showError" /> <keyword name="HgQueuesListDialog.closeEvent" id="HgQueuesListDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.closeEvent" /> - <keyword name="HgQueuesListDialog.keyPressEvent" id="HgQueuesListDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.keyPressEvent" /> <keyword name="HgQueuesListDialog.on_buttonBox_clicked" id="HgQueuesListDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.on_buttonBox_clicked" /> - <keyword name="HgQueuesListDialog.on_input_returnPressed" id="HgQueuesListDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.on_input_returnPressed" /> - <keyword name="HgQueuesListDialog.on_passwordCheckBox_toggled" id="HgQueuesListDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgQueuesListDialog.on_sendButton_clicked" id="HgQueuesListDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.on_sendButton_clicked" /> <keyword name="HgQueuesListDialog.start" id="HgQueuesListDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html#HgQueuesListDialog.start" /> <keyword name="HgQueuesListGuardsDialog" id="HgQueuesListGuardsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListGuardsDialog.html#HgQueuesListGuardsDialog" /> <keyword name="HgQueuesListGuardsDialog (Constructor)" id="HgQueuesListGuardsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListGuardsDialog.html#HgQueuesListGuardsDialog.__init__" /> @@ -7994,21 +7936,14 @@ <keyword name="HgShelveBrowserDialog.__finish" id="HgShelveBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__finish" /> <keyword name="HgShelveBrowserDialog.__generateShelveEntry" id="HgShelveBrowserDialog.__generateShelveEntry" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__generateShelveEntry" /> <keyword name="HgShelveBrowserDialog.__getShelveEntries" id="HgShelveBrowserDialog.__getShelveEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__getShelveEntries" /> - <keyword name="HgShelveBrowserDialog.__procFinished" id="HgShelveBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__procFinished" /> <keyword name="HgShelveBrowserDialog.__processBuffer" id="HgShelveBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__processBuffer" /> - <keyword name="HgShelveBrowserDialog.__readStderr" id="HgShelveBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__readStderr" /> - <keyword name="HgShelveBrowserDialog.__readStdout" id="HgShelveBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__readStdout" /> <keyword name="HgShelveBrowserDialog.__resetUI" id="HgShelveBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resetUI" /> <keyword name="HgShelveBrowserDialog.__resizeColumnsShelves" id="HgShelveBrowserDialog.__resizeColumnsShelves" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resizeColumnsShelves" /> <keyword name="HgShelveBrowserDialog.__showError" id="HgShelveBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__showError" /> <keyword name="HgShelveBrowserDialog.__unshelve" id="HgShelveBrowserDialog.__unshelve" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__unshelve" /> <keyword name="HgShelveBrowserDialog.closeEvent" id="HgShelveBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.closeEvent" /> - <keyword name="HgShelveBrowserDialog.keyPressEvent" id="HgShelveBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.keyPressEvent" /> <keyword name="HgShelveBrowserDialog.on_buttonBox_clicked" id="HgShelveBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_buttonBox_clicked" /> - <keyword name="HgShelveBrowserDialog.on_input_returnPressed" id="HgShelveBrowserDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_input_returnPressed" /> - <keyword name="HgShelveBrowserDialog.on_passwordCheckBox_toggled" id="HgShelveBrowserDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_passwordCheckBox_toggled" /> <keyword name="HgShelveBrowserDialog.on_refreshButton_clicked" id="HgShelveBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_refreshButton_clicked" /> - <keyword name="HgShelveBrowserDialog.on_sendButton_clicked" id="HgShelveBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_sendButton_clicked" /> <keyword name="HgShelveBrowserDialog.on_shelveList_currentItemChanged" id="HgShelveBrowserDialog.on_shelveList_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_currentItemChanged" /> <keyword name="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" id="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" /> <keyword name="HgShelveBrowserDialog.show" id="HgShelveBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.show" /> @@ -8046,10 +7981,7 @@ <keyword name="HgStatusDialog.__getUnversionedItems" id="HgStatusDialog.__getUnversionedItems" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__getUnversionedItems" /> <keyword name="HgStatusDialog.__initActionsMenu" id="HgStatusDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__initActionsMenu" /> <keyword name="HgStatusDialog.__lfAdd" id="HgStatusDialog.__lfAdd" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__lfAdd" /> - <keyword name="HgStatusDialog.__procFinished" id="HgStatusDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__procFinished" /> <keyword name="HgStatusDialog.__processOutputLine" id="HgStatusDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__processOutputLine" /> - <keyword name="HgStatusDialog.__readStderr" id="HgStatusDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__readStderr" /> - <keyword name="HgStatusDialog.__readStdout" id="HgStatusDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__readStdout" /> <keyword name="HgStatusDialog.__refreshDiff" id="HgStatusDialog.__refreshDiff" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__refreshDiff" /> <keyword name="HgStatusDialog.__resizeColumns" id="HgStatusDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__resizeColumns" /> <keyword name="HgStatusDialog.__resort" id="HgStatusDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__resort" /> @@ -8059,12 +7991,8 @@ <keyword name="HgStatusDialog.__showActionsMenu" id="HgStatusDialog.__showActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__showActionsMenu" /> <keyword name="HgStatusDialog.__showError" id="HgStatusDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__showError" /> <keyword name="HgStatusDialog.closeEvent" id="HgStatusDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.closeEvent" /> - <keyword name="HgStatusDialog.keyPressEvent" id="HgStatusDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.keyPressEvent" /> <keyword name="HgStatusDialog.on_buttonBox_clicked" id="HgStatusDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_buttonBox_clicked" /> - <keyword name="HgStatusDialog.on_input_returnPressed" id="HgStatusDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_input_returnPressed" /> - <keyword name="HgStatusDialog.on_passwordCheckBox_toggled" id="HgStatusDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_passwordCheckBox_toggled" /> <keyword name="HgStatusDialog.on_refreshButton_clicked" id="HgStatusDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_refreshButton_clicked" /> - <keyword name="HgStatusDialog.on_sendButton_clicked" id="HgStatusDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_sendButton_clicked" /> <keyword name="HgStatusDialog.on_statusFilterCombo_activated" id="HgStatusDialog.on_statusFilterCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusFilterCombo_activated" /> <keyword name="HgStatusDialog.on_statusList_itemSelectionChanged" id="HgStatusDialog.on_statusList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusList_itemSelectionChanged" /> <keyword name="HgStatusDialog.show" id="HgStatusDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.show" /> @@ -8112,21 +8040,14 @@ <keyword name="HgTagBranchListDialog.__finish" id="HgTagBranchListDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__finish" /> <keyword name="HgTagBranchListDialog.__generateItem" id="HgTagBranchListDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__generateItem" /> <keyword name="HgTagBranchListDialog.__highlightCurrentBranch" id="HgTagBranchListDialog.__highlightCurrentBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__highlightCurrentBranch" /> - <keyword name="HgTagBranchListDialog.__procFinished" id="HgTagBranchListDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__procFinished" /> <keyword name="HgTagBranchListDialog.__processOutputLine" id="HgTagBranchListDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__processOutputLine" /> - <keyword name="HgTagBranchListDialog.__readStderr" id="HgTagBranchListDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__readStderr" /> - <keyword name="HgTagBranchListDialog.__readStdout" id="HgTagBranchListDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__readStdout" /> <keyword name="HgTagBranchListDialog.__resizeColumns" id="HgTagBranchListDialog.__resizeColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__resizeColumns" /> <keyword name="HgTagBranchListDialog.__resort" id="HgTagBranchListDialog.__resort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__resort" /> <keyword name="HgTagBranchListDialog.__showError" id="HgTagBranchListDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__showError" /> <keyword name="HgTagBranchListDialog.__switchTo" id="HgTagBranchListDialog.__switchTo" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__switchTo" /> <keyword name="HgTagBranchListDialog.closeEvent" id="HgTagBranchListDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.closeEvent" /> - <keyword name="HgTagBranchListDialog.keyPressEvent" id="HgTagBranchListDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.keyPressEvent" /> <keyword name="HgTagBranchListDialog.on_buttonBox_clicked" id="HgTagBranchListDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_buttonBox_clicked" /> - <keyword name="HgTagBranchListDialog.on_input_returnPressed" id="HgTagBranchListDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_input_returnPressed" /> - <keyword name="HgTagBranchListDialog.on_passwordCheckBox_toggled" id="HgTagBranchListDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_passwordCheckBox_toggled" /> <keyword name="HgTagBranchListDialog.on_refreshButton_clicked" id="HgTagBranchListDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_refreshButton_clicked" /> - <keyword name="HgTagBranchListDialog.on_sendButton_clicked" id="HgTagBranchListDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_sendButton_clicked" /> <keyword name="HgTagBranchListDialog.on_tagList_customContextMenuRequested" id="HgTagBranchListDialog.on_tagList_customContextMenuRequested" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.on_tagList_customContextMenuRequested" /> <keyword name="HgTagBranchListDialog.start" id="HgTagBranchListDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.start" /> <keyword name="HgTagDialog" id="HgTagDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog" />
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html Sun Feb 02 11:27:46 2020 +0100 @@ -35,6 +35,10 @@ <table> <tr> +<td><a href="#DummyThreadWrapper">DummyThreadWrapper</a></td> +<td>Wrapper class for threading._DummyThread.</td> +</tr> +<tr> <td><a href="#QThreadWrapper">QThreadWrapper</a></td> <td>Wrapper class for *.QThread.</td> </tr> @@ -58,6 +62,49 @@ </table> <hr /> <hr /> +<a NAME="DummyThreadWrapper" ID="DummyThreadWrapper"></a> +<h2>DummyThreadWrapper</h2> + +<p> + Wrapper class for threading._DummyThread. +</p> +<h3>Derived from</h3> +module._DummyThread, ThreadWrapper +<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="#DummyThreadWrapper.__init__">DummyThreadWrapper</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> + +<a NAME="DummyThreadWrapper.__init__" ID="DummyThreadWrapper.__init__"></a> +<h4>DummyThreadWrapper (Constructor)</h4> +<b>DummyThreadWrapper</b>(<i>*args, **kwargs</i>) + +<p> + Constructor +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> <a NAME="QThreadWrapper" ID="QThreadWrapper"></a> <h2>QThreadWrapper</h2>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -85,22 +85,10 @@ <td>Private method to generate a patch item in the list of patches.</td> </tr> <tr> -<td><a href="#HgGpgSignaturesDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgGpgSignaturesDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgGpgSignaturesDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgGpgSignaturesDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgGpgSignaturesDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -117,10 +105,6 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgGpgSignaturesDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgGpgSignaturesDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr> @@ -129,22 +113,10 @@ <td>Private slot called, when a new filter category is selected.</td> </tr> <tr> -<td><a href="#HgGpgSignaturesDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgGpgSignaturesDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgGpgSignaturesDialog.on_rxEdit_textChanged">on_rxEdit_textChanged</a></td> <td>Private slot called, when a filter expression is entered.</td> </tr> <tr> -<td><a href="#HgGpgSignaturesDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged">on_signaturesList_itemSelectionChanged</a></td> <td>Private slot handling changes of the selection.</td> </tr> @@ -218,24 +190,6 @@ signature of the changeset (string) </dd> </dl> -<a NAME="HgGpgSignaturesDialog.__procFinished" ID="HgGpgSignaturesDialog.__procFinished"></a> -<h4>HgGpgSignaturesDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgGpgSignaturesDialog.__processOutputLine" ID="HgGpgSignaturesDialog.__processOutputLine"></a> <h4>HgGpgSignaturesDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -250,28 +204,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgGpgSignaturesDialog.__readStderr" ID="HgGpgSignaturesDialog.__readStderr"></a> -<h4>HgGpgSignaturesDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgGpgSignaturesDialog.__readStdout" ID="HgGpgSignaturesDialog.__readStdout"></a> -<h4>HgGpgSignaturesDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgGpgSignaturesDialog.__resizeColumns" ID="HgGpgSignaturesDialog.__resizeColumns"></a> <h4>HgGpgSignaturesDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -314,20 +246,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgGpgSignaturesDialog.keyPressEvent" ID="HgGpgSignaturesDialog.keyPressEvent"></a> -<h4>HgGpgSignaturesDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgGpgSignaturesDialog.on_buttonBox_clicked" ID="HgGpgSignaturesDialog.on_buttonBox_clicked"></a> <h4>HgGpgSignaturesDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -356,27 +274,6 @@ text of the selected category (string) </dd> </dl> -<a NAME="HgGpgSignaturesDialog.on_input_returnPressed" ID="HgGpgSignaturesDialog.on_input_returnPressed"></a> -<h4>HgGpgSignaturesDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgGpgSignaturesDialog.on_passwordCheckBox_toggled" ID="HgGpgSignaturesDialog.on_passwordCheckBox_toggled"></a> -<h4>HgGpgSignaturesDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgGpgSignaturesDialog.on_rxEdit_textChanged" ID="HgGpgSignaturesDialog.on_rxEdit_textChanged"></a> <h4>HgGpgSignaturesDialog.on_rxEdit_textChanged</h4> <b>on_rxEdit_textChanged</b>(<i>txt</i>) @@ -391,13 +288,6 @@ filter expression (string) </dd> </dl> -<a NAME="HgGpgSignaturesDialog.on_sendButton_clicked" ID="HgGpgSignaturesDialog.on_sendButton_clicked"></a> -<h4>HgGpgSignaturesDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" ID="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged"></a> <h4>HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged</h4> <b>on_signaturesList_itemSelectionChanged</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -81,22 +81,10 @@ <td>Private method to generate an annotate item in the annotation list.</td> </tr> <tr> -<td><a href="#HgAnnotateDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgAnnotateDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgAnnotateDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgAnnotateDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgAnnotateDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -109,26 +97,10 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgAnnotateDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgAnnotateDialog.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="#HgAnnotateDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgAnnotateDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> -<td><a href="#HgAnnotateDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the hg process.</td> -</tr> -<tr> <td><a href="#HgAnnotateDialog.start">start</a></td> <td>Public slot to start the annotate command.</td> </tr> @@ -195,24 +167,6 @@ text of the change (string) </dd> </dl> -<a NAME="HgAnnotateDialog.__procFinished" ID="HgAnnotateDialog.__procFinished"></a> -<h4>HgAnnotateDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgAnnotateDialog.__processOutputLine" ID="HgAnnotateDialog.__processOutputLine"></a> <h4>HgAnnotateDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -227,28 +181,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgAnnotateDialog.__readStderr" ID="HgAnnotateDialog.__readStderr"></a> -<h4>HgAnnotateDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgAnnotateDialog.__readStdout" ID="HgAnnotateDialog.__readStdout"></a> -<h4>HgAnnotateDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the annotation list. -</p> <a NAME="HgAnnotateDialog.__resizeColumns" ID="HgAnnotateDialog.__resizeColumns"></a> <h4>HgAnnotateDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -284,20 +216,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgAnnotateDialog.keyPressEvent" ID="HgAnnotateDialog.keyPressEvent"></a> -<h4>HgAnnotateDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgAnnotateDialog.on_buttonBox_clicked" ID="HgAnnotateDialog.on_buttonBox_clicked"></a> <h4>HgAnnotateDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -312,34 +230,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgAnnotateDialog.on_input_returnPressed" ID="HgAnnotateDialog.on_input_returnPressed"></a> -<h4>HgAnnotateDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgAnnotateDialog.on_passwordCheckBox_toggled" ID="HgAnnotateDialog.on_passwordCheckBox_toggled"></a> -<h4>HgAnnotateDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> -<a NAME="HgAnnotateDialog.on_sendButton_clicked" ID="HgAnnotateDialog.on_sendButton_clicked"></a> -<h4>HgAnnotateDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the hg process. -</p> <a NAME="HgAnnotateDialog.start" ID="HgAnnotateDialog.start"></a> <h4>HgAnnotateDialog.start</h4> <b>start</b>(<i>fn</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksInOutDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -82,22 +82,10 @@ <td>Private method to generate a bookmark item in the bookmarks list.</td> </tr> <tr> -<td><a href="#HgBookmarksInOutDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgBookmarksInOutDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgBookmarksInOutDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgBookmarksInOutDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgBookmarksInOutDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -114,26 +102,10 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgBookmarksInOutDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgBookmarksInOutDialog.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="#HgBookmarksInOutDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgBookmarksInOutDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> -<td><a href="#HgBookmarksInOutDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgBookmarksInOutDialog.start">start</a></td> <td>Public slot to start the bookmarks command.</td> </tr> @@ -200,24 +172,6 @@ name of the bookmark (string) </dd> </dl> -<a NAME="HgBookmarksInOutDialog.__procFinished" ID="HgBookmarksInOutDialog.__procFinished"></a> -<h4>HgBookmarksInOutDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgBookmarksInOutDialog.__processOutputLine" ID="HgBookmarksInOutDialog.__processOutputLine"></a> <h4>HgBookmarksInOutDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -232,28 +186,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgBookmarksInOutDialog.__readStderr" ID="HgBookmarksInOutDialog.__readStderr"></a> -<h4>HgBookmarksInOutDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgBookmarksInOutDialog.__readStdout" ID="HgBookmarksInOutDialog.__readStdout"></a> -<h4>HgBookmarksInOutDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgBookmarksInOutDialog.__resizeColumns" ID="HgBookmarksInOutDialog.__resizeColumns"></a> <h4>HgBookmarksInOutDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -296,20 +228,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgBookmarksInOutDialog.keyPressEvent" ID="HgBookmarksInOutDialog.keyPressEvent"></a> -<h4>HgBookmarksInOutDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgBookmarksInOutDialog.on_buttonBox_clicked" ID="HgBookmarksInOutDialog.on_buttonBox_clicked"></a> <h4>HgBookmarksInOutDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -324,34 +242,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgBookmarksInOutDialog.on_input_returnPressed" ID="HgBookmarksInOutDialog.on_input_returnPressed"></a> -<h4>HgBookmarksInOutDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ID="HgBookmarksInOutDialog.on_passwordCheckBox_toggled"></a> -<h4>HgBookmarksInOutDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> -<a NAME="HgBookmarksInOutDialog.on_sendButton_clicked" ID="HgBookmarksInOutDialog.on_sendButton_clicked"></a> -<h4>HgBookmarksInOutDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgBookmarksInOutDialog.start" ID="HgBookmarksInOutDialog.start"></a> <h4>HgBookmarksInOutDialog.start</h4> <b>start</b>(<i>path</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBookmarksListDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -85,10 +85,6 @@ <td>Private method to generate a bookmark item in the bookmarks list.</td> </tr> <tr> -<td><a href="#HgBookmarksListDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgBookmarksListDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> @@ -101,14 +97,6 @@ <td>Private slot to push the selected bookmark.</td> </tr> <tr> -<td><a href="#HgBookmarksListDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgBookmarksListDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgBookmarksListDialog.__renameBookmark">__renameBookmark</a></td> <td>Private slot to rename the selected bookmark.</td> </tr> @@ -133,10 +121,6 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgBookmarksListDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested">on_bookmarksList_customContextMenuRequested</a></td> <td>Private slot to handle the context menu request.</td> </tr> @@ -145,22 +129,10 @@ <td>Private slot called by a button of the button box clicked.</td> </tr> <tr> -<td><a href="#HgBookmarksListDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgBookmarksListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgBookmarksListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the status display.</td> </tr> <tr> -<td><a href="#HgBookmarksListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgBookmarksListDialog.start">start</a></td> <td>Public slot to start the bookmarks command.</td> </tr> @@ -230,24 +202,6 @@ name of the bookmark (string) </dd> </dl> -<a NAME="HgBookmarksListDialog.__procFinished" ID="HgBookmarksListDialog.__procFinished"></a> -<h4>HgBookmarksListDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgBookmarksListDialog.__processOutputLine" ID="HgBookmarksListDialog.__processOutputLine"></a> <h4>HgBookmarksListDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -276,28 +230,6 @@ <p> Private slot to push the selected bookmark. </p> -<a NAME="HgBookmarksListDialog.__readStderr" ID="HgBookmarksListDialog.__readStderr"></a> -<h4>HgBookmarksListDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgBookmarksListDialog.__readStdout" ID="HgBookmarksListDialog.__readStdout"></a> -<h4>HgBookmarksListDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgBookmarksListDialog.__renameBookmark" ID="HgBookmarksListDialog.__renameBookmark"></a> <h4>HgBookmarksListDialog.__renameBookmark</h4> <b>__renameBookmark</b>(<i></i>) @@ -354,20 +286,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgBookmarksListDialog.keyPressEvent" ID="HgBookmarksListDialog.keyPressEvent"></a> -<h4>HgBookmarksListDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested" ID="HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested"></a> <h4>HgBookmarksListDialog.on_bookmarksList_customContextMenuRequested</h4> <b>on_bookmarksList_customContextMenuRequested</b>(<i>pos</i>) @@ -396,27 +314,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgBookmarksListDialog.on_input_returnPressed" ID="HgBookmarksListDialog.on_input_returnPressed"></a> -<h4>HgBookmarksListDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgBookmarksListDialog.on_passwordCheckBox_toggled" ID="HgBookmarksListDialog.on_passwordCheckBox_toggled"></a> -<h4>HgBookmarksListDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgBookmarksListDialog.on_refreshButton_clicked" ID="HgBookmarksListDialog.on_refreshButton_clicked"></a> <h4>HgBookmarksListDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i></i>) @@ -424,13 +321,6 @@ <p> Private slot to refresh the status display. </p> -<a NAME="HgBookmarksListDialog.on_sendButton_clicked" ID="HgBookmarksListDialog.on_sendButton_clicked"></a> -<h4>HgBookmarksListDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgBookmarksListDialog.start" ID="HgBookmarksListDialog.start"></a> <h4>HgBookmarksListDialog.start</h4> <b>start</b>(<i>path, bookmarksList</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -87,22 +87,10 @@ <td>Private method to get the conflict entries.</td> </tr> <tr> -<td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -119,10 +107,6 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr> @@ -139,14 +123,6 @@ <td>Private slot to open the selected file in an editor.</td> </tr> <tr> -<td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> <td>Private slot to re-merge the selected entries.</td> </tr> @@ -159,10 +135,6 @@ <td>Private slot to mark the selected entries as resolved.</td> </tr> <tr> -<td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> <td>Private slot to mark the selected entries as unresolved.</td> </tr> @@ -232,24 +204,6 @@ <p> Private method to get the conflict entries. </p> -<a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a> -<h4>HgConflictsListDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> <h4>HgConflictsListDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -264,28 +218,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a> -<h4>HgConflictsListDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a> -<h4>HgConflictsListDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> <h4>HgConflictsListDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -328,20 +260,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a> -<h4>HgConflictsListDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -388,27 +306,6 @@ <p> Private slot to open the selected file in an editor. </p> -<a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a> -<h4>HgConflictsListDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a> -<h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> <b>on_reMergeButton_clicked</b>(<i></i>) @@ -430,13 +327,6 @@ <p> Private slot to mark the selected entries as resolved. </p> -<a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a> -<h4>HgConflictsListDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> <b>on_unresolvedButton_clicked</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -82,18 +82,6 @@ <td>Private slot called when the process finished or the user pressed the button.</td> </tr> <tr> -<td><a href="#HgDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> -<td><a href="#HgDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr> -<tr> -<td><a href="#HgDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr> -<tr> <td><a href="#HgDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr> @@ -106,10 +94,6 @@ <td>Public method to check, if the last action contained an add or delete.</td> </tr> <tr> -<td><a href="#HgDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgDialog.normalExit">normalExit</a></td> <td>Public method to check for a normal process termination.</td> </tr> @@ -122,18 +106,6 @@ <td>Private slot called by a button of the button box clicked.</td> </tr> <tr> -<td><a href="#HgDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> -<td><a href="#HgDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the Mercurial process.</td> -</tr> -<tr> <td><a href="#HgDialog.startProcess">startProcess</a></td> <td>Public slot used to start the process.</td> </tr> @@ -179,46 +151,6 @@ Private slot called when the process finished or the user pressed the button. </p> -<a NAME="HgDialog.__procFinished" ID="HgDialog.__procFinished"></a> -<h4>HgDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> -<a NAME="HgDialog.__readStderr" ID="HgDialog.__readStderr"></a> -<h4>HgDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardError signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgDialog.__readStdout" ID="HgDialog.__readStdout"></a> -<h4>HgDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardOutput signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgDialog.__showError" ID="HgDialog.__showError"></a> <h4>HgDialog.__showError</h4> <b>__showError</b>(<i>out</i>) @@ -260,20 +192,6 @@ flag indicating the presence of an add or delete (boolean) </dd> </dl> -<a NAME="HgDialog.keyPressEvent" ID="HgDialog.keyPressEvent"></a> -<h4>HgDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgDialog.normalExit" ID="HgDialog.normalExit"></a> <h4>HgDialog.normalExit</h4> <b>normalExit</b>(<i></i>) @@ -315,34 +233,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgDialog.on_input_returnPressed" ID="HgDialog.on_input_returnPressed"></a> -<h4>HgDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgDialog.on_passwordCheckBox_toggled" ID="HgDialog.on_passwordCheckBox_toggled"></a> -<h4>HgDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> -<a NAME="HgDialog.on_sendButton_clicked" ID="HgDialog.on_sendButton_clicked"></a> -<h4>HgDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the Mercurial process. -</p> <a NAME="HgDialog.startProcess" ID="HgDialog.startProcess"></a> <h4>HgDialog.startProcess</h4> <b>startProcess</b>(<i>args, workingDir=None, showArgs=True, environment=None</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html Sun Feb 02 11:27:46 2020 +0100 @@ -101,14 +101,6 @@ <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgDiffGenerator.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr> -<tr> -<td><a href="#HgDiffGenerator.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr> -<tr> <td><a href="#HgDiffGenerator.getResult">getResult</a></td> <td>Public method to return the result data.</td> </tr> @@ -221,28 +213,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgDiffGenerator.__readStderr" ID="HgDiffGenerator.__readStderr"></a> -<h4>HgDiffGenerator.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardError signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgDiffGenerator.__readStdout" ID="HgDiffGenerator.__readStdout"></a> -<h4>HgDiffGenerator.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardOutput signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgDiffGenerator.getResult" ID="HgDiffGenerator.getResult"></a> <h4>HgDiffGenerator.getResult</h4> <b>getResult</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -209,10 +209,6 @@ <td>Private slot to prepare the filed search data.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.__processBuffer">__processBuffer</a></td> <td>Private method to process the buffered output of the hg log command.</td> </tr> @@ -229,14 +225,6 @@ <td>Private slot to push all changes to a remote repository.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr> -<tr> -<td><a href="#HgLogBrowserDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.__reloadGeometry">__reloadGeometry</a></td> <td>Private method to restore the geometry.</td> </tr> @@ -313,10 +301,6 @@ <td>Local function to calculate a x-position for a column.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.on_branchCombo_activated">on_branchCombo_activated</a></td> <td>Private slot called, when a new branch is selected.</td> </tr> @@ -353,10 +337,6 @@ <td>Private slot called, when the from date changes.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.on_logTree_currentItemChanged">on_logTree_currentItemChanged</a></td> <td>Private slot called, when the current item of the log tree changes.</td> </tr> @@ -373,10 +353,6 @@ <td>Private slot to handle the Next button.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the log.</td> </tr> @@ -397,10 +373,6 @@ <td>Private slot to handle selection of a side-by-side link.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the mercurial process.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.on_stopCheckBox_clicked">on_stopCheckBox_clicked</a></td> <td>Private slot called, when the stop on copy/move checkbox is clicked.</td> </tr> @@ -959,24 +931,6 @@ that the field index is a data role (integer, string, boolean) </dd> </dl> -<a NAME="HgLogBrowserDialog.__procFinished" ID="HgLogBrowserDialog.__procFinished"></a> -<h4>HgLogBrowserDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgLogBrowserDialog.__processBuffer" ID="HgLogBrowserDialog.__processBuffer"></a> <h4>HgLogBrowserDialog.__processBuffer</h4> <b>__processBuffer</b>(<i></i>) @@ -1006,27 +960,6 @@ <p> Private slot to push all changes to a remote repository. </p> -<a NAME="HgLogBrowserDialog.__readStderr" ID="HgLogBrowserDialog.__readStderr"></a> -<h4>HgLogBrowserDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardError signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgLogBrowserDialog.__readStdout" ID="HgLogBrowserDialog.__readStdout"></a> -<h4>HgLogBrowserDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardOutput signal. -</p> -<p> - It reads the output of the process and inserts it into a buffer. -</p> <a NAME="HgLogBrowserDialog.__reloadGeometry" ID="HgLogBrowserDialog.__reloadGeometry"></a> <h4>HgLogBrowserDialog.__reloadGeometry</h4> <b>__reloadGeometry</b>(<i></i>) @@ -1213,20 +1146,6 @@ radius of the indicator circle (integer) </dd> </dl> -<a NAME="HgLogBrowserDialog.keyPressEvent" ID="HgLogBrowserDialog.keyPressEvent"></a> -<h4>HgLogBrowserDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgLogBrowserDialog.on_branchCombo_activated" ID="HgLogBrowserDialog.on_branchCombo_activated"></a> <h4>HgLogBrowserDialog.on_branchCombo_activated</h4> <b>on_branchCombo_activated</b>(<i>txt</i>) @@ -1336,13 +1255,6 @@ new date (QDate) </dd> </dl> -<a NAME="HgLogBrowserDialog.on_input_returnPressed" ID="HgLogBrowserDialog.on_input_returnPressed"></a> -<h4>HgLogBrowserDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> <a NAME="HgLogBrowserDialog.on_logTree_currentItemChanged" ID="HgLogBrowserDialog.on_logTree_currentItemChanged"></a> <h4>HgLogBrowserDialog.on_logTree_currentItemChanged</h4> <b>on_logTree_currentItemChanged</b>(<i>current, previous</i>) @@ -1389,20 +1301,6 @@ <p> Private slot to handle the Next button. </p> -<a NAME="HgLogBrowserDialog.on_passwordCheckBox_toggled" ID="HgLogBrowserDialog.on_passwordCheckBox_toggled"></a> -<h4>HgLogBrowserDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgLogBrowserDialog.on_refreshButton_clicked" ID="HgLogBrowserDialog.on_refreshButton_clicked"></a> <h4>HgLogBrowserDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i>addNext=False</i>) @@ -1467,13 +1365,6 @@ text of the selected link </dd> </dl> -<a NAME="HgLogBrowserDialog.on_sendButton_clicked" ID="HgLogBrowserDialog.on_sendButton_clicked"></a> -<h4>HgLogBrowserDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the mercurial process. -</p> <a NAME="HgLogBrowserDialog.on_stopCheckBox_clicked" ID="HgLogBrowserDialog.on_stopCheckBox_clicked"></a> <h4>HgLogBrowserDialog.on_stopCheckBox_clicked</h4> <b>on_stopCheckBox_clicked</b>(<i>checked</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -159,22 +159,10 @@ <td>Private slot to add a file to the repository.</td> </tr> <tr> -<td><a href="#HgStatusDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgStatusDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgStatusDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr> -<tr> -<td><a href="#HgStatusDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr> -<tr> <td><a href="#HgStatusDialog.__refreshDiff">__refreshDiff</a></td> <td>Private method to refresh the diff output after a refresh.</td> </tr> @@ -211,30 +199,14 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgStatusDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgStatusDialog.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="#HgStatusDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgStatusDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgStatusDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the status display.</td> </tr> <tr> -<td><a href="#HgStatusDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgStatusDialog.on_statusFilterCombo_activated">on_statusFilterCombo_activated</a></td> <td>Private slot to react to the selection of a status filter.</td> </tr> @@ -484,24 +456,6 @@ add mode (string one of 'normal' or 'large') </dd> </dl> -<a NAME="HgStatusDialog.__procFinished" ID="HgStatusDialog.__procFinished"></a> -<h4>HgStatusDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgStatusDialog.__processOutputLine" ID="HgStatusDialog.__processOutputLine"></a> <h4>HgStatusDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -516,28 +470,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgStatusDialog.__readStderr" ID="HgStatusDialog.__readStderr"></a> -<h4>HgStatusDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardError signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgStatusDialog.__readStdout" ID="HgStatusDialog.__readStdout"></a> -<h4>HgStatusDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardOutput signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgStatusDialog.__refreshDiff" ID="HgStatusDialog.__refreshDiff"></a> <h4>HgStatusDialog.__refreshDiff</h4> <b>__refreshDiff</b>(<i></i>) @@ -615,20 +547,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgStatusDialog.keyPressEvent" ID="HgStatusDialog.keyPressEvent"></a> -<h4>HgStatusDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgStatusDialog.on_buttonBox_clicked" ID="HgStatusDialog.on_buttonBox_clicked"></a> <h4>HgStatusDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -643,27 +561,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgStatusDialog.on_input_returnPressed" ID="HgStatusDialog.on_input_returnPressed"></a> -<h4>HgStatusDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgStatusDialog.on_passwordCheckBox_toggled" ID="HgStatusDialog.on_passwordCheckBox_toggled"></a> -<h4>HgStatusDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgStatusDialog.on_refreshButton_clicked" ID="HgStatusDialog.on_refreshButton_clicked"></a> <h4>HgStatusDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i></i>) @@ -671,13 +568,6 @@ <p> Private slot to refresh the status display. </p> -<a NAME="HgStatusDialog.on_sendButton_clicked" ID="HgStatusDialog.on_sendButton_clicked"></a> -<h4>HgStatusDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgStatusDialog.on_statusFilterCombo_activated" ID="HgStatusDialog.on_statusFilterCombo_activated"></a> <h4>HgStatusDialog.on_statusFilterCombo_activated</h4> <b>on_statusFilterCombo_activated</b>(<i>txt</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html Sun Feb 02 11:27:46 2020 +0100 @@ -128,6 +128,18 @@ <p> Private method to initialize the Mercurial client. </p> +<dl> +<dt>Returns:</dt> +<dd> +tuple containing an OK flag and potentially an error message +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, str) +</dd> +</dl> <a NAME="HgStatusMonitorThread._getInfo" ID="HgStatusMonitorThread._getInfo"></a> <h4>HgStatusMonitorThread._getInfo</h4> <b>_getInfo</b>(<i></i>) @@ -135,10 +147,6 @@ <p> Protected method implementing the real info action. </p> -<p> - This method should be overridden and create a short info message to be - shown in the main window status bar right next to the status indicator. -</p> <dl> <dt>Returns:</dt> <dd> @@ -159,10 +167,10 @@ Protected method implementing the monitoring action. </p> <p> - This method populates the statusList member variable - with a list of strings giving the status in the first column and the - path relative to the project directory starting with the third column. - The allowed status flags are: + This method populates the statusList member variable with a list of + strings giving the status in the first column and the path relative + to the project directory starting with the third column. The allowed + status flags are: <ul> <li>"A" path was added but not yet comitted</li> <li>"M" path has local changes</li> @@ -176,8 +184,14 @@ <dl> <dt>Returns:</dt> <dd> -tuple of flag indicating successful operation (boolean) and - a status message in case of non successful operation (string) +tuple of flag indicating successful operation and a status + message in case of non successful operation +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, str) </dd> </dl> <a NAME="HgStatusMonitorThread._shutdown" ID="HgStatusMonitorThread._shutdown"></a>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -93,22 +93,10 @@ <td>Private method to highlight the current branch with a bold font.</td> </tr> <tr> -<td><a href="#HgTagBranchListDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgTagBranchListDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgTagBranchListDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgTagBranchListDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgTagBranchListDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -129,30 +117,14 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgTagBranchListDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgTagBranchListDialog.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="#HgTagBranchListDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgTagBranchListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> <td><a href="#HgTagBranchListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the log.</td> </tr> <tr> -<td><a href="#HgTagBranchListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgTagBranchListDialog.on_tagList_customContextMenuRequested">on_tagList_customContextMenuRequested</a></td> <td>Private slot to handle the context menu request.</td> </tr> @@ -240,24 +212,6 @@ <p> Private method to highlight the current branch with a bold font. </p> -<a NAME="HgTagBranchListDialog.__procFinished" ID="HgTagBranchListDialog.__procFinished"></a> -<h4>HgTagBranchListDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgTagBranchListDialog.__processOutputLine" ID="HgTagBranchListDialog.__processOutputLine"></a> <h4>HgTagBranchListDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -272,28 +226,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgTagBranchListDialog.__readStderr" ID="HgTagBranchListDialog.__readStderr"></a> -<h4>HgTagBranchListDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgTagBranchListDialog.__readStdout" ID="HgTagBranchListDialog.__readStdout"></a> -<h4>HgTagBranchListDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgTagBranchListDialog.__resizeColumns" ID="HgTagBranchListDialog.__resizeColumns"></a> <h4>HgTagBranchListDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -343,20 +275,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgTagBranchListDialog.keyPressEvent" ID="HgTagBranchListDialog.keyPressEvent"></a> -<h4>HgTagBranchListDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgTagBranchListDialog.on_buttonBox_clicked" ID="HgTagBranchListDialog.on_buttonBox_clicked"></a> <h4>HgTagBranchListDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -371,27 +289,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgTagBranchListDialog.on_input_returnPressed" ID="HgTagBranchListDialog.on_input_returnPressed"></a> -<h4>HgTagBranchListDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgTagBranchListDialog.on_passwordCheckBox_toggled" ID="HgTagBranchListDialog.on_passwordCheckBox_toggled"></a> -<h4>HgTagBranchListDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> <a NAME="HgTagBranchListDialog.on_refreshButton_clicked" ID="HgTagBranchListDialog.on_refreshButton_clicked"></a> <h4>HgTagBranchListDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i></i>) @@ -399,13 +296,6 @@ <p> Private slot to refresh the log. </p> -<a NAME="HgTagBranchListDialog.on_sendButton_clicked" ID="HgTagBranchListDialog.on_sendButton_clicked"></a> -<h4>HgTagBranchListDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgTagBranchListDialog.on_tagList_customContextMenuRequested" ID="HgTagBranchListDialog.on_tagList_customContextMenuRequested"></a> <h4>HgTagBranchListDialog.on_tagList_customContextMenuRequested</h4> <b>on_tagList_customContextMenuRequested</b>(<i>pos</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesHeaderDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -78,18 +78,6 @@ <td>Private slot called when the process finished or the user pressed the button.</td> </tr> <tr> -<td><a href="#HgQueuesHeaderDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> -<td><a href="#HgQueuesHeaderDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgQueuesHeaderDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgQueuesHeaderDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr> @@ -142,46 +130,6 @@ Private slot called when the process finished or the user pressed the button. </p> -<a NAME="HgQueuesHeaderDialog.__procFinished" ID="HgQueuesHeaderDialog.__procFinished"></a> -<h4>HgQueuesHeaderDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> -<a NAME="HgQueuesHeaderDialog.__readStderr" ID="HgQueuesHeaderDialog.__readStderr"></a> -<h4>HgQueuesHeaderDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgQueuesHeaderDialog.__readStdout" ID="HgQueuesHeaderDialog.__readStdout"></a> -<h4>HgQueuesHeaderDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgQueuesHeaderDialog.__showError" ID="HgQueuesHeaderDialog.__showError"></a> <h4>HgQueuesHeaderDialog.__showError</h4> <b>__showError</b>(<i>out</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesListDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -94,22 +94,10 @@ <td>Private slot to mark the top patch entry.</td> </tr> <tr> -<td><a href="#HgQueuesListDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr> -<tr> <td><a href="#HgQueuesListDialog.__processOutputLine">__processOutputLine</a></td> <td>Private method to process the lines of output.</td> </tr> <tr> -<td><a href="#HgQueuesListDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStderr signal.</td> -</tr> -<tr> -<td><a href="#HgQueuesListDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStdout signal.</td> -</tr> -<tr> <td><a href="#HgQueuesListDialog.__resizeColumns">__resizeColumns</a></td> <td>Private method to resize the list columns.</td> </tr> @@ -126,26 +114,10 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgQueuesListDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr> -<tr> <td><a href="#HgQueuesListDialog.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="#HgQueuesListDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgQueuesListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr> -<tr> -<td><a href="#HgQueuesListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr> -<tr> <td><a href="#HgQueuesListDialog.start">start</a></td> <td>Public slot to start the list command.</td> </tr> @@ -249,24 +221,6 @@ name of the patch (string) </dd> </dl> -<a NAME="HgQueuesListDialog.__procFinished" ID="HgQueuesListDialog.__procFinished"></a> -<h4>HgQueuesListDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgQueuesListDialog.__processOutputLine" ID="HgQueuesListDialog.__processOutputLine"></a> <h4>HgQueuesListDialog.__processOutputLine</h4> <b>__processOutputLine</b>(<i>line</i>) @@ -281,28 +235,6 @@ output line to be processed (string) </dd> </dl> -<a NAME="HgQueuesListDialog.__readStderr" ID="HgQueuesListDialog.__readStderr"></a> -<h4>HgQueuesListDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStderr signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgQueuesListDialog.__readStdout" ID="HgQueuesListDialog.__readStdout"></a> -<h4>HgQueuesListDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStdout signal. -</p> -<p> - It reads the output of the process, formats it and inserts it into - the contents pane. -</p> <a NAME="HgQueuesListDialog.__resizeColumns" ID="HgQueuesListDialog.__resizeColumns"></a> <h4>HgQueuesListDialog.__resizeColumns</h4> <b>__resizeColumns</b>(<i></i>) @@ -345,20 +277,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgQueuesListDialog.keyPressEvent" ID="HgQueuesListDialog.keyPressEvent"></a> -<h4>HgQueuesListDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl> <a NAME="HgQueuesListDialog.on_buttonBox_clicked" ID="HgQueuesListDialog.on_buttonBox_clicked"></a> <h4>HgQueuesListDialog.on_buttonBox_clicked</h4> <b>on_buttonBox_clicked</b>(<i>button</i>) @@ -373,34 +291,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgQueuesListDialog.on_input_returnPressed" ID="HgQueuesListDialog.on_input_returnPressed"></a> -<h4>HgQueuesListDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgQueuesListDialog.on_passwordCheckBox_toggled" ID="HgQueuesListDialog.on_passwordCheckBox_toggled"></a> -<h4>HgQueuesListDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl> -<a NAME="HgQueuesListDialog.on_sendButton_clicked" ID="HgQueuesListDialog.on_sendButton_clicked"></a> -<h4>HgQueuesListDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the subversion process. -</p> <a NAME="HgQueuesListDialog.start" ID="HgQueuesListDialog.start"></a> <h4>HgQueuesListDialog.start</h4> <b>start</b>(<i>path</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html Sun Feb 02 11:27:46 2020 +0100 @@ -93,22 +93,10 @@ <td>Private method to retrieve the list of shelves.</td> </tr> <tr> -<td><a href="#HgShelveBrowserDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</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.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr> -<tr> <td><a href="#HgShelveBrowserDialog.__resetUI">__resetUI</a></td> <td>Private method to reset the user interface.</td> </tr> @@ -129,30 +117,14 @@ <td>Protected slot implementing a close event handler.</td> </tr> <tr> -<td><a href="#HgShelveBrowserDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</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_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</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_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the mercurial process.</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> @@ -256,24 +228,6 @@ <p> Private method to retrieve the list of shelves. </p> -<a NAME="HgShelveBrowserDialog.__procFinished" ID="HgShelveBrowserDialog.__procFinished"></a> -<h4>HgShelveBrowserDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) - -<p> - Private slot connected to the finished signal. -</p> -<dl> - -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd> -<dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl> <a NAME="HgShelveBrowserDialog.__processBuffer" ID="HgShelveBrowserDialog.__processBuffer"></a> <h4>HgShelveBrowserDialog.__processBuffer</h4> <b>__processBuffer</b>(<i></i>) @@ -281,27 +235,6 @@ <p> Private method to process the buffered output of the hg shelve command. </p> -<a NAME="HgShelveBrowserDialog.__readStderr" ID="HgShelveBrowserDialog.__readStderr"></a> -<h4>HgShelveBrowserDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardError signal. -</p> -<p> - It reads the error output of the process and inserts it into the - error pane. -</p> -<a NAME="HgShelveBrowserDialog.__readStdout" ID="HgShelveBrowserDialog.__readStdout"></a> -<h4>HgShelveBrowserDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) - -<p> - Private slot to handle the readyReadStandardOutput signal. -</p> -<p> - It reads the output of the process and inserts it into a buffer. -</p> <a NAME="HgShelveBrowserDialog.__resetUI" ID="HgShelveBrowserDialog.__resetUI"></a> <h4>HgShelveBrowserDialog.__resetUI</h4> <b>__resetUI</b>(<i></i>) @@ -351,20 +284,6 @@ close event (QCloseEvent) </dd> </dl> -<a NAME="HgShelveBrowserDialog.keyPressEvent" ID="HgShelveBrowserDialog.keyPressEvent"></a> -<h4>HgShelveBrowserDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) - -<p> - Protected slot to handle a key press event. -</p> -<dl> - -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</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>) @@ -379,27 +298,6 @@ button that was clicked (QAbstractButton) </dd> </dl> -<a NAME="HgShelveBrowserDialog.on_input_returnPressed" ID="HgShelveBrowserDialog.on_input_returnPressed"></a> -<h4>HgShelveBrowserDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) - -<p> - Private slot to handle the press of the return key in the input field. -</p> -<a NAME="HgShelveBrowserDialog.on_passwordCheckBox_toggled" ID="HgShelveBrowserDialog.on_passwordCheckBox_toggled"></a> -<h4>HgShelveBrowserDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) - -<p> - Private slot to handle the password checkbox toggled. -</p> -<dl> - -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</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>) @@ -407,13 +305,6 @@ <p> Private slot to refresh the list of shelves. </p> -<a NAME="HgShelveBrowserDialog.on_sendButton_clicked" ID="HgShelveBrowserDialog.on_sendButton_clicked"></a> -<h4>HgShelveBrowserDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) - -<p> - Private slot to send the input to the mercurial process. -</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>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Feb 02 11:27:46 2020 +0100 @@ -95,6 +95,10 @@ <td>Private method to check, if the default and default-push URLs have been configured.</td> </tr> <tr> +<td><a href="#Hg.__createClient">__createClient</a></td> +<td>Private method to create a Mercurial command server client.</td> +</tr> +<tr> <td><a href="#Hg.__getExtensionsInfo">__getExtensionsInfo</a></td> <td>Private method to get the active extensions from Mercurial.</td> </tr> @@ -579,6 +583,20 @@ Private method to check, if the default and default-push URLs have been configured. </p> +<a NAME="Hg.__createClient" ID="Hg.__createClient"></a> +<h4>Hg.__createClient</h4> +<b>__createClient</b>(<i>repodir=""</i>) + +<p> + Private method to create a Mercurial command server client. +</p> +<dl> + +<dt><i>repodir</i> (str)</dt> +<dd> +path of the local repository +</dd> +</dl> <a NAME="Hg.__getExtensionsInfo" ID="Hg.__getExtensionsInfo"></a> <h4>Hg.__getExtensionsInfo</h4> <b>__getExtensionsInfo</b>(<i></i>)
--- a/eric6/E5Gui/E5ModelMenu.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/E5Gui/E5ModelMenu.py Sun Feb 02 11:27:46 2020 +0100 @@ -266,7 +266,10 @@ """ fm = QFontMetrics(self.font()) if self.__maxWidth == -1: - self.__maxWidth = fm.width('m') * 30 + try: + self.__maxWidth = fm.horizontalAdvance("m") * 30 + except AttributeError: + self.__maxWidth = fm.width('m') * 30 smallText = fm.elidedText(text, Qt.ElideMiddle, self.__maxWidth) return QAction(icon, smallText, parent)
--- a/eric6/E5Gui/E5SqueezeLabels.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/E5Gui/E5SqueezeLabels.py Sun Feb 02 11:27:46 2020 +0100 @@ -37,7 +37,11 @@ @param event reference to the paint event (QPaintEvent) """ fm = self.fontMetrics() - if fm.width(self.__text) > self.contentsRect().width(): + try: + pixelLength = fm.horizontalAdvance(self.__text) + except AttributeError: + pixelLength = fm.width(self.__text) + if pixelLength > self.contentsRect().width(): self.__elided = fm.elidedText( self.text(), Qt.ElideMiddle, self.width()) super(E5SqueezeLabel, self).setText(self.__elided) @@ -110,9 +114,7 @@ @param event reference to the paint event (QPaintEvent) """ - fm = self.fontMetrics() - if (fm.width(self.__surrounding.format(self.__path)) > - self.contentsRect().width()): + if self.length(self.__path) > self.contentsRect().width(): super(E5SqueezeLabelPath, self).setText( self.__surrounding.format(compactPath(self.__path, self.contentsRect().width(), @@ -130,4 +132,8 @@ @param txt text to calculate the length for after wrapped (string) @return length of the wrapped text in pixels (integer) """ - return self.fontMetrics().width(self.__surrounding.format(txt)) + fm = self.fontMetrics() + try: + return fm.horizontalAdvance(self.__surrounding.format(txt)) + except AttributeError: + return fm.width(self.__surrounding.format(txt))
--- a/eric6/E5Gui/E5ZoomWidget.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/E5Gui/E5ZoomWidget.py Sun Feb 02 11:27:46 2020 +0100 @@ -292,7 +292,10 @@ ) fmtStr = "{0}%" if self.__percent else "{0}" label = fmtStr.format("0" * labelLen) - width = self.valueLabel.fontMetrics().width(label) + try: + width = self.valueLabel.fontMetrics().horizontalAdvance(label) + except AttributeError: + width = self.valueLabel.fontMetrics().width(label) self.valueLabel.setMinimumWidth(width) self.valueLabel.setMaximumWidth(width)
--- a/eric6/HexEdit/HexEditWidget.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/HexEdit/HexEditWidget.py Sun Feb 02 11:27:46 2020 +0100 @@ -612,7 +612,10 @@ @type QFont """ super(HexEditWidget, self).setFont(font) - self.__pxCharWidth = self.fontMetrics().width("2") + try: + self.__pxCharWidth = self.fontMetrics().horizontalAdvance("2") + except AttributeError: + self.__pxCharWidth = self.fontMetrics().width("2") self.__pxCharHeight = self.fontMetrics().height() self.__pxGapAdr = self.__pxCharWidth // 2 self.__pxGapAdrHex = self.__pxCharWidth
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,7 @@ Module implementing a dialog to select the heads to be closed. """ - -import os - -from PyQt5.QtCore import pyqtSlot, QProcess +from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem from .Ui_HgCloseHeadSelectionDialog import Ui_HgCloseHeadSelectionDialog @@ -59,25 +56,7 @@ output = "" client = vcs.getClient() - if client is None: - # find the root of the repo - repodir = self.splitPath(ppath)[0] - while not os.path.isdir(os.path.join(repodir, self.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return [] - - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = client.runcommand(args) + output, error = client.runcommand(args) heads = [] if output:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,22 +7,15 @@ Module implementing a dialog showing signed changesets. """ - import os -from PyQt5.QtCore import ( - pyqtSlot, QProcess, QTimer, Qt, QRegExp, QCoreApplication -) +from PyQt5.QtCore import pyqtSlot, Qt, QRegExp, QCoreApplication from PyQt5.QtWidgets import ( - QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem ) -from E5Gui import E5MessageBox - from .Ui_HgGpgSignaturesDialog import Ui_HgGpgSignaturesDialog -from Globals import strToQByteArray - class HgGpgSignaturesDialog(QDialog, Ui_HgGpgSignaturesDialog): """ @@ -42,14 +35,9 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.process = QProcess() self.vcs = vcs self.__hgClient = vcs.getClient() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -59,17 +47,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -96,55 +75,21 @@ args = self.vcs.initCommand("sigs") - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -166,19 +111,7 @@ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() + self.__hgClient.cancel() def __resort(self): """ @@ -222,20 +155,6 @@ topItm = topItems[0] QTreeWidgetItem(topItm, [signature]) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -250,18 +169,6 @@ signature = " ".join(li) self.__generateItem(rev, changeset, signature) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -342,53 +249,3 @@ else: childItem.setHidden(False) topLevelItem.setHidden(visibleChildren == 0) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgGpgSignaturesDialog, self).keyPressEvent(evt)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -154,64 +154,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout" name="_2"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -236,9 +178,6 @@ <tabstop>signaturesList</tabstop> <tabstop>verifyButton</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,21 +7,17 @@ Module implementing a dialog to show the output of the hg annotate command. """ - import os import re -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication +from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtWidgets import ( - QDialog, QDialogButtonBox, QHeaderView, QLineEdit, QTreeWidgetItem + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem ) -from E5Gui import E5MessageBox - from .Ui_HgAnnotateDialog import Ui_HgAnnotateDialog import Preferences -from Globals import strToQByteArray class HgAnnotateDialog(QDialog, Ui_HgAnnotateDialog): @@ -53,14 +49,6 @@ font = Preferences.getEditorOtherFonts("MonospacedFont") self.annotateList.setFont(font) - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -70,17 +58,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -114,55 +93,21 @@ args.append('--quiet') args.append(fn) - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -185,15 +130,6 @@ else: self.__finish() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - def __resizeColumns(self): """ Private method to resize the list columns. @@ -218,20 +154,6 @@ itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(4, Qt.AlignRight) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the annotation list. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -248,18 +170,6 @@ self.__generateItem(rev.strip(), changeset.strip(), author.strip(), date.strip(), text) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -269,53 +179,3 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the hg process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgAnnotateDialog, self).keyPressEvent(evt)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -93,64 +93,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -165,9 +107,6 @@ <tabstops> <tabstop>annotateList</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,20 +7,15 @@ Module implementing a dialog to show a list of incoming or outgoing bookmarks. """ - import os -from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtWidgets import ( - QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem ) -from E5Gui import E5MessageBox - from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog -from Globals import strToQByteArray - class HgBookmarksInOutDialog(QDialog, Ui_HgBookmarksInOutDialog): """ @@ -54,7 +49,6 @@ elif mode == self.OUTGOING: self.setWindowTitle(self.tr("Mercurial Outgoing Bookmarks")) - self.process = QProcess() self.vcs = vcs self.mode = mode self.__hgClient = vcs.getClient() @@ -63,10 +57,6 @@ self.bookmarksList.columnCount(), "") self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -76,17 +66,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -119,55 +100,21 @@ raise ValueError("Bad value for mode") args.append('--bookmarks') - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -194,15 +141,6 @@ else: self.__finish() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - def __resort(self): """ Private method to resort the tree. @@ -230,19 +168,6 @@ name, changeset]) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -256,18 +181,6 @@ name = " ".join(li) self.__generateItem(changeset, name) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -277,53 +190,3 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgBookmarksInOutDialog, self).keyPressEvent(evt)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -79,64 +79,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -150,9 +92,6 @@ </widget> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>bookmarksList</tabstop> <tabstop>errors</tabstop> <tabstop>buttonBox</tabstop>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,12 +7,9 @@ Module implementing a dialog to show a list of bookmarks. """ - import os -from PyQt5.QtCore import ( - pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, QPoint -) +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, QMenu, QInputDialog @@ -24,7 +21,6 @@ from .Ui_HgBookmarksListDialog import Ui_HgBookmarksListDialog import UI.PixmapCache -from Globals import strToQByteArray class HgBookmarksListDialog(QDialog, Ui_HgBookmarksListDialog): @@ -50,7 +46,6 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.process = QProcess() self.vcs = vcs self.__bookmarksList = None self.__repoDir = None @@ -62,10 +57,6 @@ self.bookmarksList.columnCount(), "") self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -75,17 +66,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -120,60 +102,23 @@ args = self.vcs.initCommand("bookmarks") - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.refreshButton.setEnabled(False) - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.inputGroup.setEnabled(True) - self.inputGroup.show() - self.refreshButton.setEnabled(False) + self.refreshButton.setEnabled(False) + + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) @@ -218,15 +163,6 @@ elif button == self.refreshButton: self.on_refreshButton_clicked() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - def __resort(self): """ Private method to resort the tree. @@ -266,20 +202,6 @@ # error message itm.setData(0, Qt.DisplayRole, revision) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -301,18 +223,6 @@ if self.__bookmarksList is not None: self.__bookmarksList.append(name) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -323,56 +233,6 @@ self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgBookmarksListDialog, self).keyPressEvent(evt) - @pyqtSlot() def on_refreshButton_clicked(self): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -96,64 +96,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -167,9 +109,6 @@ </widget> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>bookmarksList</tabstop> <tabstop>errors</tabstop> <tabstop>buttonBox</tabstop>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sun Feb 02 11:27:46 2020 +0100 @@ -318,6 +318,12 @@ output and/or error functions were given, the respective return value will be an empty string. """ + if not self.__started: + # try to start the Mercurial command server + ok, startError = self.startServer() + if not ok: + return "", startError + self.__commandRunning = True outputChannels = {} outputBuffer = None
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -8,22 +8,19 @@ conflicts. """ - import os -from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtCore import pyqtSlot, Qt, QPoint from PyQt5.QtWidgets import ( - QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, + QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication, QWidget ) -from E5Gui import E5MessageBox from E5Gui.E5Application import e5App from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog import Utilities.MimeTypes -from Globals import strToQByteArray class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): @@ -63,13 +60,6 @@ self.project = e5App().getObject("Project") self.__hgClient = vcs.getClient() - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """ @@ -77,17 +67,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() self.__position = self.pos() @@ -136,60 +117,27 @@ args = self.vcs.initCommand("resolve") args.append('--list') - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(self.__repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - QApplication.restoreOverrideCursor() self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) self.__resizeColumns() @@ -206,22 +154,10 @@ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() + self.__hgClient.cancel() elif button == self.refreshButton: self.on_refreshButton_clicked() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - def __resort(self): """ Private method to resort the tree. @@ -257,20 +193,6 @@ itm.setData(0, self.StatusRole, status) itm.setData(0, self.FilenameRole, self.project.getAbsolutePath(name)) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -280,32 +202,6 @@ status, filename = line.strip().split(None, 1) self.__generateItem(status, filename) - @pyqtSlot() - def on_refreshButton_clicked(self): - """ - Private slot to refresh the log. - """ - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.inputGroup.setEnabled(True) - self.inputGroup.show() - self.refreshButton.setEnabled(False) - self.start(self.__repodir) - - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -316,55 +212,17 @@ self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) + @pyqtSlot() + def on_refreshButton_clicked(self): """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): + Private slot to refresh the log. """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgConflictsListDialog, self).keyPressEvent(evt) + self.refreshButton.setEnabled(False) + self.start(self.__repodir) @pyqtSlot(QTreeWidgetItem, int) def on_conflictsList_itemDoubleClicked(self, item, column):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -158,64 +158,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout" name="_2"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -234,9 +176,6 @@ <tabstop>reMergeButton</tabstop> <tabstop>editButton</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,21 +7,13 @@ Module implementing a dialog starting a process and showing its output. """ - -import os - -from PyQt5.QtCore import ( - QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment -) -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit - -from E5Gui import E5MessageBox +from PyQt5.QtCore import Qt, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgDialog import Ui_HgDialog import Preferences import Utilities -from Globals import strToQByteArray class HgDialog(QDialog, Ui_HgDialog): @@ -49,13 +41,8 @@ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.process = None self.username = '' self.password = '' - if useClient: - self.__hgClient = hg.getClient() - else: - self.__hgClient = None self.vcs = hg self.outputGroup.setTitle(text) @@ -68,19 +55,6 @@ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.process = None - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -103,20 +77,7 @@ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0) - self.__finish() + self.vcs.getClient().cancel() def startProcess(self, args, workingDir=None, showArgs=True, environment=None): @@ -132,7 +93,6 @@ """ self.errorGroup.hide() self.normal = False - self.intercept = False self.__hasAddOrDelete = False if ( @@ -150,53 +110,19 @@ self.resultbox.append(' '.join(args)) self.resultbox.append('') - if self.__hgClient is None: - self.process = QProcess() - if environment: - env = QProcessEnvironment.systemEnvironment() - for key, value in environment.items(): - env.insert(key, value) - self.process.setProcessEnvironment(env) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - if workingDir: - self.process.setWorkingDirectory(workingDir) - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.buttonBox.setFocus() - self.inputGroup.setEnabled(False) - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() - return procStarted - else: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand( - args, output=self.__showOutput, error=self.__showError) - - if err: - self.__showError(err) - if out: - self.__showOutput(out) - - self.normal = True - - self.__finish() - - return True + out, err = self.vcs.getClient().runcommand( + args, output=self.__showOutput, error=self.__showError) + + if err: + self.__showError(err) + if out: + self.__showOutput(out) + + self.normal = True + + self.__finish() + + return True def normalExit(self): """ @@ -215,19 +141,6 @@ """ return self.normal and self.errors.toPlainText() == "" - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardOutput(), - self.vcs.getEncoding(), - 'replace') - self.__showOutput(s) - def __showOutput(self, out): """ Private slot to show some output. @@ -246,19 +159,6 @@ QCoreApplication.processEvents() - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), - 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -271,56 +171,6 @@ QCoreApplication.processEvents() - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the Mercurial process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgDialog, self).keyPressEvent(evt) - def hasAddOrDelete(self): """ Public method to check, if the last action contained an add or delete.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -68,64 +68,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -141,9 +83,6 @@ <tabstops> <tabstop>resultbox</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,9 @@ Module implementing a class to generate the output of the hg diff command. """ - import os -from PyQt5.QtCore import pyqtSignal, QProcess, QTimer, QObject +from PyQt5.QtCore import pyqtSignal, QObject class HgDiffGenerator(QObject): @@ -33,29 +32,13 @@ self.vcs = vcs self.__hgClient = self.vcs.getClient() - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__finish) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) def stopProcess(self): """ Public slot to stop the diff process. """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() def __getVersionArg(self, version): """ @@ -124,34 +107,18 @@ self.__output = [] self.__errors = [] - if self.__hgClient: - out, err = self.__hgClient.runcommand(args) - - if err: - self.__errors = err.splitlines(True) - - if out: - for line in out.splitlines(True): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - - self.__finish() - else: - # find the root of the repo - repodir = dname - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return False - - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - return False + out, err = self.__hgClient.runcommand(args) + + if err: + self.__errors = err.splitlines(True) + + if out: + for line in out.splitlines(True): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + + self.__finish() return True @@ -218,29 +185,3 @@ self.__processFileLine(line) self.__output.append(line) - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace') - self.__processOutputLine(line) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__errors.append(s)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,14 +7,11 @@ Module implementing a dialog to browse the log history. """ - import os import re import collections -from PyQt5.QtCore import ( - pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize, QPoint, QFileInfo -) +from PyQt5.QtCore import pyqtSlot, Qt, QDate, QRegExp, QSize, QPoint, QFileInfo from PyQt5.QtGui import ( QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon, QTextCursor ) @@ -34,7 +31,6 @@ import UI.PixmapCache import Preferences import Utilities -from Globals import strToQByteArray COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple", "cyan", "olive", "magenta", "darkred", "darkmagenta", @@ -200,14 +196,6 @@ # roles used in the file tree self.__diffFileLineRole = Qt.UserRole - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.flags = { 'A': self.tr('Added'), 'D': self.tr('Deleted'), @@ -430,17 +418,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() self.vcs.getPlugin().setPreferences( "LogBrowserGeometry", self.saveGeometry()) @@ -756,31 +735,7 @@ if not self.projectMode: args.append(self.__filename) - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") - - if errMsg: - E5MessageBox.critical( - self, - self.tr("Mercurial Error"), - errMsg) + output, errMsg = self.__hgClient.runcommand(args) if output: parents = [int(p) for p in output.strip().splitlines()] @@ -796,25 +751,7 @@ args = self.vcs.initCommand("identify") args.append("-nb") - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") + output, errMsg = self.__hgClient.runcommand(args) if errMsg: E5MessageBox.critical( @@ -843,25 +780,7 @@ args = self.vcs.initCommand("branches") args.append("--closed") - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") + output, errMsg = self.__hgClient.runcommand(args) if errMsg: E5MessageBox.critical( @@ -888,25 +807,7 @@ args.append("--template") args.append("{rev}\n") - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") + output, errMsg = self.__hgClient.runcommand(args) if errMsg: E5MessageBox.critical( @@ -933,25 +834,7 @@ args = self.vcs.initCommand("tags") - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") + output, errMsg = self.__hgClient.runcommand(args) if errMsg: E5MessageBox.critical( @@ -1137,74 +1020,37 @@ if not self.projectMode: args.append(self.__filename) - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - if preargs: - out, err = self.__hgClient.runcommand(preargs) - else: - err = "" - if err: - if ( - self.commandMode == "incoming" and - self.initialCommandMode == "full_log" - ): - # ignore the error - self.commandMode = "log" - else: - self.__showError(err) - elif ( - self.commandMode != "incoming" or - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or - self.__bundle - ): - out, err = self.__hgClient.runcommand(args) - self.buf = out.splitlines(True) - if err: - self.__showError(err) - self.__processBuffer() - elif ( + if preargs: + out, err = self.__hgClient.runcommand(preargs) + else: + err = "" + if err: + if ( self.commandMode == "incoming" and self.initialCommandMode == "full_log" ): - # no incoming changesets, just switch to log mode + # ignore the error self.commandMode = "log" - self.__finish() - else: - self.process.kill() - - self.process.setWorkingDirectory(self.repodir) - - if preargs: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - process.waitForFinished(30000) - - if ( - self.commandMode != "incoming" or - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or - self.__bundle - ): - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) else: - self.__finish() + self.__showError(err) + elif ( + self.commandMode != "incoming" or + (self.vcs.bundleFile and + os.path.exists(self.vcs.bundleFile)) or + self.__bundle + ): + out, err = self.__hgClient.runcommand(args) + self.buf = out.splitlines(True) + if err: + self.__showError(err) + self.__processBuffer() + elif ( + self.commandMode == "incoming" and + self.initialCommandMode == "full_log" + ): + # no incoming changesets, just switch to log mode + self.commandMode = "log" + self.__finish() def start(self, fn, bundle=None, isFile=False, noEntries=0): """ @@ -1257,37 +1103,17 @@ self.__getHeads() self.__getLogEntries(noEntries=noEntries) - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__processBuffer() - self.__finish() - def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - QApplication.restoreOverrideCursor() self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) while self.__finishCallbacks: @@ -1496,31 +1322,6 @@ items[0].setSelected(True) self.__selectedRevisions = [] - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace') - self.buf.append(line) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -1530,11 +1331,6 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - - if not self.__hgClient: - # show input in case the process asked for some input - self.inputGroup.setEnabled(True) - self.inputGroup.show() def on_buttonBox_clicked(self, button): """ @@ -1546,10 +1342,7 @@ self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): self.cancelled = True - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() + self.__hgClient.cancel() elif button == self.refreshButton: self.on_refreshButton_clicked() @@ -2158,56 +1951,6 @@ self.start(self.__filename, bundle=self.__bundle, isFile=self.__isFile, noEntries=self.logTree.topLevelItemCount()) - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the mercurial process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgLogBrowserDialog, self).keyPressEvent(evt) - @pyqtSlot() def __phaseActTriggered(self): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -178,7 +178,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <widget class="QWidget" name=""> + <widget class="QWidget" name="layoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QTreeWidget" name="logTree"> @@ -537,64 +537,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -636,9 +578,6 @@ <tabstop>saveLabel</tabstop> <tabstop>diffEdit</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> </tabstops> <resources/> <connections/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -8,13 +8,12 @@ process. """ - import os -from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize +from PyQt5.QtCore import pyqtSlot, Qt, QSize from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import ( - QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, QLineEdit + QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem ) from E5Gui.E5Application import e5App @@ -27,7 +26,6 @@ import Preferences import UI.PixmapCache -from Globals import strToQByteArray class HgStatusDialog(QWidget, Ui_HgStatusDialog): @@ -64,13 +62,6 @@ self.vcs.committed.connect(self.__committed) self.__hgClient = self.vcs.getClient() self.__mq = mq - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) self.statusList.headerItem().setText(self.__lastColumn, "") self.statusList.header().setSortIndicator( @@ -212,17 +203,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() if self.__mq: self.vcs.getPlugin().setPreferences( @@ -353,60 +335,23 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.refreshButton.setEnabled(False) - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - if self.process: - self.process.kill() - - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.refreshButton.setEnabled(False) + self.refreshButton.setEnabled(False) + + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) @@ -436,37 +381,10 @@ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() + self.__hgClient.cancel() elif button == self.refreshButton: self.on_refreshButton_clicked() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - if self.process is not None: - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace') - self.__processOutputLine(line) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -477,18 +395,6 @@ status, path = line.strip().split(" ", 1) self.__generateItem(status, path) - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -498,61 +404,6 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - - if not self.__hgClient: - # show input in case the process asked for some input - self.inputGroup.setEnabled(True) - self.inputGroup.show() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgStatusDialog, self).keyPressEvent(evt) @pyqtSlot() def on_refreshButton_clicked(self):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -175,64 +175,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -251,9 +193,6 @@ <tabstop>statusList</tabstop> <tabstop>diffEdit</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> </tabstops> <resources/> <connections/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,9 +7,6 @@ Module implementing the VCS status monitor thread class for Mercurial. """ - -from PyQt5.QtCore import QProcess - from VCS.StatusMonitorThread import VcsStatusMonitorThread @@ -29,16 +26,15 @@ VcsStatusMonitorThread.__init__(self, interval, project, vcs, parent) self.__client = None - self.__useCommandLine = False def _performMonitor(self): """ Protected method implementing the monitoring action. - This method populates the statusList member variable - with a list of strings giving the status in the first column and the - path relative to the project directory starting with the third column. - The allowed status flags are: + This method populates the statusList member variable with a list of + strings giving the status in the first column and the path relative + to the project directory starting with the third column. The allowed + status flags are: <ul> <li>"A" path was added but not yet comitted</li> <li>"M" path has local changes</li> @@ -49,41 +45,22 @@ <li>" " path is back at normal</li> </ul> - @return tuple of flag indicating successful operation (boolean) and - a status message in case of non successful operation (string) + @return tuple of flag indicating successful operation and a status + message in case of non successful operation + @rtype tuple of (bool, str) """ self.shouldUpdate = False - self.__initClient() + ok, err = self.__initClient() + if not ok: + return False, err # step 1: get overall status args = self.vcs.initCommand("status") args.append('--noninteractive') args.append('--all') - output = "" - error = "" - if self.__client: - output, error = self.__client.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.projectDir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(300000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - process.kill() - process.waitForFinished() - error = str(process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - else: - process.kill() - process.waitForFinished() - error = self.tr("Could not start the Mercurial process.") + output, error = self.__client.runcommand(args) if error: return False, error @@ -103,19 +80,7 @@ args = self.vcs.initCommand("resolve") args.append('--list') - output = "" - error = "" - if self.__client: - output, error = self.__client.runcommand(args) - else: - process.setWorkingDirectory(self.projectDir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(300000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output, error = self.__client.runcommand(args) for line in output.splitlines(): flag, name = line.split(" ", 1) @@ -144,42 +109,19 @@ """ Protected method implementing the real info action. - This method should be overridden and create a short info message to be - shown in the main window status bar right next to the status indicator. - @return short info message @rtype str """ - self.__initClient() + ok, err = self.__initClient() + if not ok: + return "" args = self.vcs.initCommand("identify") args.append('--num') args.append('--id') args.append('--branch') - output = "" - error = "" - if self.__client: - output, error = self.__client.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.projectDir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(300000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - process.kill() - process.waitForFinished() - error = str(process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - else: - process.kill() - process.waitForFinished() - error = self.tr("Could not start the Mercurial process.") + output, error = self.__client.runcommand(args) if error: # ignore errors @@ -204,12 +146,18 @@ def __initClient(self): """ Private method to initialize the Mercurial client. + + @return tuple containing an OK flag and potentially an error message + @rtype tuple of (bool, str) """ - if self.__client is None and not self.__useCommandLine: + if self.__client is None: from .HgClient import HgClient client = HgClient(self.projectDir, "utf-8", self.vcs) ok, err = client.startServer() if ok: self.__client = client - else: - self.__useCommandLine = True + else: + ok = True + err = "" + + return ok, err
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,14 +7,11 @@ Module implementing a dialog to show a list of tags or branches. """ - import os -from PyQt5.QtCore import ( - pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, QPoint -) +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint from PyQt5.QtWidgets import ( - QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, QMenu, + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QMenu, QAbstractItemView ) @@ -24,7 +21,6 @@ from .Ui_HgTagBranchListDialog import Ui_HgTagBranchListDialog import UI.PixmapCache -from Globals import strToQByteArray class HgTagBranchListDialog(QDialog, Ui_HgTagBranchListDialog): @@ -61,14 +57,6 @@ self.tagList.headerItem().setText(self.tagList.columnCount(), "") self.tagList.header().setSortIndicator(3, Qt.AscendingOrder) - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -78,17 +66,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -135,54 +114,21 @@ args = self.vcs.initCommand("branches") args.append('--closed') - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) @@ -214,22 +160,10 @@ if button == self.buttonBox.button(QDialogButtonBox.Close): self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() + self.__hgClient.cancel() elif button == self.refreshButton: self.on_refreshButton_clicked() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - def __resort(self): """ Private method to resort the tree. @@ -263,20 +197,6 @@ itm.setTextAlignment(1, Qt.AlignRight) itm.setTextAlignment(2, Qt.AlignHCenter) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -307,18 +227,6 @@ if self.allTagsList is not None: self.allTagsList.append(name) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -329,56 +237,6 @@ self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgTagBranchListDialog, self).keyPressEvent(evt) - def __highlightCurrentBranch(self): """ Private method to highlight the current branch with a bold font. @@ -402,9 +260,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - if not self.__hgClient: - self.inputGroup.setEnabled(True) - self.inputGroup.show() self.refreshButton.setEnabled(False) # save the current items commit ID
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -96,64 +96,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -169,9 +111,6 @@ <tabstops> <tabstop>tagList</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,8 @@ Module implementing the purge extension interface. """ - import os -from PyQt5.QtCore import QProcess from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension @@ -55,21 +53,9 @@ args.append("--all") client = self.vcs.getClient() - if client: - out, err = client.runcommand(args) - if out: - purgeEntries = out.strip().split() - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - purgeEntries = str( - process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace').strip().split() + out, err = client.runcommand(args) + if out: + purgeEntries = out.strip().split() return purgeEntries
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,9 @@ Module implementing a dialog to define guards for patches. """ - import os -from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QCoreApplication +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem ) @@ -61,9 +60,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() if self.__dirtyList: res = E5MessageBox.question( @@ -135,19 +133,7 @@ if patch: args.append(patch) - output = "" - if self.__hgClient: - output = self.__hgClient.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(self.__repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace').strip() + output = self.__hgClient.runcommand(args)[0] if output: patchName, guards = output.split(":", 1) @@ -275,27 +261,7 @@ else: args.append("--none") - error = "" - if self.__hgClient: - error = self.__hgClient.runcommand(args)[1] - else: - process = QProcess() - process.setWorkingDirectory(self.__repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished: - if process.exitCode() != 0: - error = str(process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - else: - E5MessageBox.warning( - self, - self.tr("Apply Guard Definitions"), - self.tr( - """The Mercurial process did not finish""" - """ in time.""")) + error = self.__hgClient.runcommand(args)[1] if error: E5MessageBox.warning(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -10,11 +10,9 @@ import os -from PyQt5.QtCore import QProcess, QTimer, Qt, QCoreApplication +from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtWidgets import QDialog, QDialogButtonBox -from E5Gui import E5MessageBox - from .Ui_HgQueuesHeaderDialog import Ui_HgQueuesHeaderDialog import Utilities @@ -41,14 +39,6 @@ self.vcs = vcs self.__hgClient = vcs.getClient() - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.show() QCoreApplication.processEvents() @@ -58,17 +48,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -91,42 +72,19 @@ args = self.vcs.initCommand("qheader") - if self.__hgClient: - out, err = self.__hgClient.runcommand( - args, output=self.__showOutput, error=self.__showError) - if err: - self.__showError(err) - if out: - self.__showOutPut(out) - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) + out, err = self.__hgClient.runcommand( + args, output=self.__showOutput, error=self.__showError) + if err: + self.__showError(err) + if out: + self.__showOutPut(out) + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -147,27 +105,6 @@ else: self.__finish() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - self.__showOutput(s) - def __showOutput(self, out): """ Private slot to show some output. @@ -176,18 +113,6 @@ """ self.messageEdit.appendPlainText(Utilities.filterAnsiSequences(out)) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,9 @@ Module implementing a dialog to show all guards for all patches. """ - import os -from PyQt5.QtCore import Qt, QProcess, QCoreApplication +from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtWidgets import QDialog, QTreeWidgetItem from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog @@ -57,19 +56,7 @@ args = self.vcs.initCommand("qguard") args.append("--list") - output = "" - if self.__hgClient: - output = self.__hgClient.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output = self.__hgClient.runcommand(args)[0] if output: guardsDict = {}
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -10,17 +10,13 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtCore import Qt, QCoreApplication from PyQt5.QtWidgets import ( - QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem ) -from E5Gui import E5MessageBox - from .Ui_HgQueuesListDialog import Ui_HgQueuesListDialog -from Globals import strToQByteArray - class HgQueuesListDialog(QDialog, Ui_HgQueuesListDialog): """ @@ -46,14 +42,6 @@ self.patchesList.header().setSortIndicator(0, Qt.AscendingOrder) - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.__statusDict = { "A": self.tr("applied"), "U": self.tr("not applied"), @@ -70,17 +58,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -126,44 +105,21 @@ if missing: args.append('--missing') - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - self.__mode = "" - break - if self.__mode == "qseries": - self.__getSeries(True) - elif self.__mode == "missing": - self.__getTop() - else: - self.__finish() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + self.__mode = "" + break + if self.__mode == "qseries": + self.__getSeries(True) + elif self.__mode == "missing": + self.__getTop() else: - self.process.kill() - self.process.setWorkingDirectory(self.__repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + self.__finish() def __getTop(self): """ @@ -173,55 +129,21 @@ args = self.vcs.initCommand("qtop") - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out: - for line in out.splitlines(): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - self.process.setWorkingDirectory(self.__repodir) - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.inputGroup.setEnabled(True) - self.inputGroup.show() + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -245,24 +167,7 @@ self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): self.__mode = "" - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - if self.__mode == "qseries": - self.__getSeries(True) - elif self.__mode == "missing": - self.__getTop() - else: - self.__finish() + self.__hgClient.cancel() def __resort(self): """ @@ -334,20 +239,6 @@ font.setBold(True) itm.setFont(column, font) - def __readStdout(self): - """ - Private slot to handle the readyReadStdout signal. - - It reads the output of the process, formats it and inserts it into - the contents pane. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace').strip() - self.__processOutputLine(s) - def __processOutputLine(self, line): """ Private method to process the lines of output. @@ -372,18 +263,6 @@ return self.__generateItem(index, status, name, summary) - def __readStderr(self): - """ - Private slot to handle the readyReadStderr signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -393,53 +272,3 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgQueuesListDialog, self).keyPressEvent(evt)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -50,7 +50,7 @@ <string/> </property> <property name="textAlignment"> - <set>AlignLeft|AlignVCenter</set> + <set>AlignLeading|AlignVCenter</set> </property> </column> <column> @@ -96,64 +96,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -167,9 +109,6 @@ </widget> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>patchesList</tabstop> <tabstop>errors</tabstop> <tabstop>buttonBox</tabstop>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,9 @@ Module implementing a dialog to show the guards of a selected patch. """ - import os -from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication from PyQt5.QtWidgets import QDialog, QListWidgetItem from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog @@ -34,7 +33,6 @@ self.setupUi(self) self.setWindowFlags(Qt.Window) - self.process = QProcess() self.vcs = vcs self.__hgClient = vcs.getClient() @@ -49,17 +47,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() e.accept() @@ -95,19 +84,7 @@ if patch: args.append(patch) - output = "" - if self.__hgClient: - output = self.__hgClient.runcommand(args)[0].strip() - else: - process = QProcess() - process.setWorkingDirectory(self.__repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace').strip() + output = self.__hgClient.runcommand(args)[0].strip() if output: patchName, guards = output.split(":", 1)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,8 +7,7 @@ Module implementing a dialog used by the queue management functions. """ - -from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QCoreApplication +from PyQt5.QtCore import pyqtSlot, Qt, QCoreApplication from PyQt5.QtWidgets import ( QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem, QAbstractButton @@ -99,19 +98,7 @@ args = self.vcs.initCommand("qqueue") args.append("--list") - output = "" - if self.__hgClient: - output = self.__hgClient.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(self.__repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output = self.__hgClient.runcommand(args)[0] for queue in output.splitlines(): queue = queue.strip()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,8 @@ Module implementing the queues extension interface. """ - import os -from PyQt5.QtCore import QProcess from PyQt5.QtWidgets import QDialog, QApplication, QInputDialog from E5Gui import E5MessageBox @@ -98,19 +96,7 @@ args.append("--summary") client = self.vcs.getClient() - output = "" - if client: - output = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output = client.runcommand(args)[0] for line in output.splitlines(): if withSummary: @@ -137,19 +123,7 @@ args = self.vcs.initCommand("qtop") client = self.vcs.getClient() - if client: - currentPatch = client.runcommand(args)[0].strip() - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - currentPatch = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), - 'replace').strip() + currentPatch = client.runcommand(args)[0].strip() return currentPatch @@ -165,18 +139,7 @@ args = self.vcs.initCommand("qheader") client = self.vcs.getClient() - if client: - message = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - message = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + message = client.runcommand(args)[0] return message @@ -195,19 +158,7 @@ args.append("--series") client = self.vcs.getClient() - output = "" - if client: - output = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output = client.runcommand(args)[0] for guard in output.splitlines(): guard = guard.strip() @@ -646,15 +597,7 @@ args.append("--none") client = self.vcs.getClient() - if client: - client.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - process.waitForFinished(30000) + client.runcommand(args) else: E5MessageBox.information( None, @@ -776,20 +719,7 @@ args.append(queueName) client = self.vcs.getClient() - error = "" - if client: - error = client.runcommand(args)[1] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished: - if process.exitCode() != 0: - error = str(process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') + error = client.runcommand(args)[1] if error: if isCreate: @@ -852,20 +782,7 @@ args.append(queueName) client = self.vcs.getClient() - error = "" - if client: - error = client.runcommand(args)[1] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished: - if process.exitCode() != 0: - error = str(process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') + error = client.runcommand(args)[1] if error: if operation == Queues.QUEUE_PURGE:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,22 +7,17 @@ Module implementing Mercurial shelve browser dialog. """ - import os -from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtCore import pyqtSlot, Qt, QPoint from PyQt5.QtGui import QCursor from PyQt5.QtWidgets import ( QWidget, QDialogButtonBox, QTreeWidgetItem, QAbstractButton, QMenu, - QHeaderView, QApplication, QLineEdit + QHeaderView, QApplication ) -from E5Gui import E5MessageBox - from .Ui_HgShelveBrowserDialog import Ui_HgShelveBrowserDialog -from Globals import strToQByteArray - class HgShelveBrowserDialog(QWidget, Ui_HgShelveBrowserDialog): """ @@ -62,14 +57,6 @@ self.__hgClient = vcs.getClient() self.__resetUI() - if self.__hgClient: - self.process = None - else: - self.process = QProcess() - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - self.__contextMenu = QMenu() self.__unshelveAct = self.__contextMenu.addAction( self.tr("Restore selected shelve"), self.__unshelve) @@ -84,17 +71,8 @@ @param e close event (QCloseEvent) """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() self.__position = self.pos() @@ -162,36 +140,12 @@ args.append("--list") args.append("--stat") - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - out, err = self.__hgClient.runcommand(args) - self.buf = out.splitlines(True) - if err: - self.__showError(err) - self.__processBuffer() - self.__finish() - else: - self.process.kill() - - self.process.setWorkingDirectory(self.repodir) - - self.inputGroup.setEnabled(True) - self.inputGroup.show() - - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) + out, err = self.__hgClient.runcommand(args) + self.buf = out.splitlines(True) + if err: + self.__showError(err) + self.__processBuffer() + self.__finish() def start(self, projectDir): """ @@ -218,37 +172,17 @@ self.__started = True self.__getShelveEntries() - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__processBuffer() - self.__finish() - def __finish(self): """ Private slot called when the process finished or the user pressed the button. """ - if ( - self.process is not None and - self.process.state() != QProcess.NotRunning - ): - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - QApplication.restoreOverrideCursor() self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.inputGroup.setEnabled(False) - self.inputGroup.hide() self.refreshButton.setEnabled(True) def __processBuffer(self): @@ -303,31 +237,6 @@ self.shelveList.setCurrentItem(self.shelveList.topLevelItem(0)) self.__started = False - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), self.vcs.getEncoding(), - 'replace') - self.buf.append(line) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - def __showError(self, out): """ Private slot to show some error. @@ -349,10 +258,7 @@ self.close() elif button == self.buttonBox.button(QDialogButtonBox.Cancel): self.cancelled = True - if self.__hgClient: - self.__hgClient.cancel() - else: - self.__finish() + self.__hgClient.cancel() elif button == self.refreshButton: self.on_refreshButton_clicked() @@ -406,63 +312,10 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.inputGroup.setEnabled(True) - self.inputGroup.show() self.refreshButton.setEnabled(False) self.start(self.__projectDir) - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the mercurial process. - """ - inputTxt = self.input.text() - inputTxt += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(inputTxt) - self.errors.ensureCursorVisible() - self.errorGroup.show() - - self.process.write(strToQByteArray(inputTxt)) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgShelveBrowserDialog, self).keyPressEvent(evt) - def __unshelve(self): """ Private slot to restore the selected shelve of changes.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui Sun Feb 02 11:27:46 2020 +0100 @@ -173,64 +173,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout" name="_2"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> @@ -243,9 +185,6 @@ <tabstop>shelveList</tabstop> <tabstop>statisticsList</tabstop> <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,10 +7,8 @@ Module implementing the shelve extension interface. """ - import os -from PyQt5.QtCore import QProcess from PyQt5.QtWidgets import QDialog from E5Gui import E5MessageBox @@ -54,19 +52,7 @@ args.append('--quiet') client = self.vcs.getClient() - output = "" - if client: - output = client.runcommand(args)[0] - else: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') + output = client.runcommand(args)[0] shelveNamesList = [] for line in output.splitlines():
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Feb 02 11:27:46 2020 +0100 @@ -7,7 +7,6 @@ Module implementing the version control systems interface to Mercurial. """ - import os import shutil @@ -25,6 +24,7 @@ from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog from .HgDialog import HgDialog +from .HgClient import HgClient import Utilities @@ -127,6 +127,7 @@ self.__iniWatcher.addPath(cfgFile) self.__client = None + self.__createClient() self.__projectHelper = None self.__repoDir = "" @@ -221,14 +222,6 @@ # shut down the client self.__client and self.__client.stopServer() - def getClient(self): - """ - Public method to get a reference to the command server interface. - - @return reference to the client (HgClient) - """ - return self.__client - def initCommand(self, command): """ Public method to initialize a command arguments list. @@ -371,11 +364,8 @@ args.append(projectDir) if noDialog: - if self.__client is None: - return self.startSynchronizedProcess(QProcess(), 'hg', args) - else: - out, err = self.__client.runcommand(args) - return err == "" + out, err = self.__client.runcommand(args) + return err == "" else: dia = HgDialog( self.tr('Cloning project from a Mercurial repository'), @@ -544,28 +534,18 @@ if msg: args.append("--message") args.append(msg) - if self.__client: - if isinstance(name, list): - self.addArguments(args, name) - else: - if dname != repodir or fname != ".": - args.append(name) + if isinstance(name, list): + self.addArguments(args, name) else: - if isinstance(name, list): - self.addArguments(args, fnames) - else: - if dname != repodir or fname != ".": - args.append(fname) - - if noDialog: - self.startSynchronizedProcess(QProcess(), "hg", args, dname) - else: - dia = HgDialog( - self.tr('Committing changes to Mercurial repository'), - self) - res = dia.startProcess(args, dname) - if res: - dia.exec_() + if dname != repodir or fname != ".": + args.append(name) + + dia = HgDialog( + self.tr('Committing changes to Mercurial repository'), + self) + res = dia.startProcess(args, dname) + if res: + dia.exec_() self.committed.emit() if self.__forgotNames: model = e5App().getObject("Project").getModel() @@ -592,19 +572,7 @@ args.append('--template') args.append('{desc}') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) return output @@ -640,10 +608,7 @@ return False if noDialog: - if self.__client is None: - self.startSynchronizedProcess(QProcess(), 'hg', args, repodir) - else: - out, err = self.__client.runcommand(args) + out, err = self.__client.runcommand(args) res = False else: dia = HgDialog(self.tr( @@ -691,10 +656,7 @@ args.append(name) if noDialog: - if self.__client is None: - self.startSynchronizedProcess(QProcess(), 'hg', args, repodir) - else: - out, err = self.__client.runcommand(args) + out, err = self.__client.runcommand(args) else: dia = HgDialog( self.tr( @@ -758,12 +720,8 @@ return False if noDialog: - if self.__client is None: - res = self.startSynchronizedProcess( - QProcess(), 'hg', args, repodir) - else: - out, err = self.__client.runcommand(args) - res = err == "" + out, err = self.__client.runcommand(args) + res = err == "" else: dia = HgDialog( self.tr( @@ -819,12 +777,8 @@ return False if noDialog: - if self.__client is None: - res = self.startSynchronizedProcess( - QProcess(), 'hg', args, repodir) - else: - out, err = self.__client.runcommand(args) - res = err == "" + out, err = self.__client.runcommand(args) + res = err == "" else: dia = HgDialog(self.tr('Renaming {0}').format(name), self) res = dia.startProcess(args, repodir) @@ -1183,19 +1137,7 @@ args.append('--all') args.append('--noninteractive') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: for line in output.splitlines(): @@ -1251,19 +1193,7 @@ args.append('--all') args.append('--noninteractive') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(dname) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: dirs = [x for x in names.keys() if os.path.isdir(x)] @@ -1411,19 +1341,7 @@ args.append('{rev}:{node|short}@@@{tags}@@@{author|xmlescape}@@@' '{date|isodate}@@@{branches}@@@{bookmarks}\n') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(ppath) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) infoBlock = [] if output: @@ -1470,18 +1388,7 @@ args = self.initCommand("showconfig") args.append('paths.default') - output = "" - if self.__client is None: - process.setWorkingDirectory(ppath) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: url = output.splitlines()[0].strip() @@ -1581,19 +1488,7 @@ args = self.initCommand("tags") args.append('--verbose') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) tagsList = [] if output: @@ -1630,19 +1525,7 @@ args = self.initCommand("branches") args.append('--closed') - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: self.branchesList = [] @@ -1768,39 +1651,7 @@ args.append(rev) args.append(name) - if self.__client is None: - output = "" - error = "" - - # find the root of the repo - repodir = self.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return "", "" - - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished: - if process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - error = str(process.readAllStandardError(), - self.getEncoding(), 'replace') - else: - error = self.tr( - "The hg process did not finish within 30s.") - else: - error = self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.').format('hg') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) # return file contents with 'universal newlines' return output.replace('\r\n', '\n').replace('\r', '\n'), error @@ -2032,26 +1883,7 @@ args.append('{rev}:{node|short}@@@{tags}@@@{author|xmlescape}@@@' '{date|isodate}@@@{branches}@@@{parents}@@@{bookmarks}\n') - output = "" - if self.__client is None: - # find the root of the repo - repodir = self.splitPath(ppath)[0] - while not os.path.isdir(os.path.join(repodir, self.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: index = 0 @@ -2263,19 +2095,7 @@ """ args = self.initCommand("branch") - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) return output.strip() @@ -3356,19 +3176,7 @@ args = self.initCommand("showconfig") args.append('paths') - output = "" - if self.__client is None: - process = QProcess() - self.__repoDir and process.setWorkingDirectory(self.__repoDir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) self.__defaultConfigured = False self.__defaultPushConfigured = False @@ -3406,19 +3214,7 @@ args = self.initCommand("identify") - output = "" - if self.__client is None: - process = QProcess() - process.setWorkingDirectory(repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) return output.count('+') == 2 @@ -3453,7 +3249,6 @@ self.tr( """<p>The Mercurial Command Server could not be""" """ restarted.</p><p>Reason: {0}</p>""").format(err)) - self.__client = None self.__getExtensionsInfo() @@ -3498,19 +3293,7 @@ args = self.initCommand("showconfig") args.append('extensions') - output = "" - if self.__client is None: - process = QProcess() - self.__repoDir and process.setWorkingDirectory(self.__repoDir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.getEncoding(), 'replace') - else: - output, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) if output: for line in output.splitlines(): @@ -3587,21 +3370,46 @@ self.__monitorRepoIniFile(project.getProjectPath()) if repodir: - from .HgClient import HgClient - client = HgClient(repodir, "utf-8", self) - ok, err = client.startServer() - if ok: - self.__client = client - else: - E5MessageBox.warning( - None, - self.tr("Mercurial Command Server"), - self.tr( - """<p>The Mercurial Command Server could not be""" - """ started.</p><p>Reason: {0}</p>""").format(err)) + self.__createClient(repodir) return self.__projectHelper - + + ########################################################################### + ## Methods to handle the Mercurial command server are below. + ########################################################################### + + def __createClient(self, repodir=""): + """ + Private method to create a Mercurial command server client. + + @param repodir path of the local repository + @type str + """ + if self.__client is not None: + self.__client.stopServer() + self.__client = None + + self.__client = HgClient(repodir, "utf-8", self) + ok, err = self.__client.startServer() + if not ok: + E5MessageBox.warning( + None, + self.tr("Mercurial Command Server"), + self.tr( + """<p>The Mercurial Command Server could not be""" + """ started.</p><p>Reason: {0}</p>""").format(err)) + + def getClient(self): + """ + Public method to get a reference to the command server interface. + + @return reference to the client (HgClient) + """ + if self.__client is None: + self.__createClient(self.__repoDir) + + return self.__client + ########################################################################### ## Status Monitor Thread methods ###########################################################################
--- a/eric6/QScintilla/Printer.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/QScintilla/Printer.py Sun Feb 02 11:27:46 2020 +0100 @@ -70,8 +70,13 @@ painter.setFont(self.headerFont) # set our header font painter.setPen(QColor(Qt.black)) # set color if drawing: + fm = painter.fontMetrics() + try: + fmWidth = fm.horizontalAdvance(header) + except AttributeError: + fmWidth = fm.width(header) painter.drawText( - area.right() - painter.fontMetrics().width(header), + area.right() - fmWidth, area.top() + painter.fontMetrics().ascent(), header) area.setTop(area.top() + painter.fontMetrics().height() + 5) painter.restore()
--- a/eric6/QScintilla/Shell.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/QScintilla/Shell.py Sun Feb 02 11:27:46 2020 +0100 @@ -1044,7 +1044,7 @@ self.setFocus() self.inRawMode = True self.echoInput = echo - self.__write(s) + self.__writeQueued(s) line, col = self.__getEndPos() self.setCursorPosition(line, col) buf = self.text(line)
--- a/eric6/Snapshot/SnapshotTimer.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/Snapshot/SnapshotTimer.py Sun Feb 02 11:27:46 2020 +0100 @@ -39,10 +39,13 @@ self.__toggle = True # text is taken from paintEvent with maximum number plus some margin - self.resize( - self.fontMetrics().width(self.tr( - "Snapshot will be taken in %n seconds", "", 99)) + 6, - self.fontMetrics().height() + 4) + try: + fmWidth = self.fontMetrics().horizontalAdvance(self.tr( + "Snapshot will be taken in %n seconds", "", 99)) + except AttributeError: + fmWidth = self.fontMetrics().width(self.tr( + "Snapshot will be taken in %n seconds", "", 99)) + self.resize(fmWidth + 6, self.fontMetrics().height() + 4) self.__timer.timeout.connect(self.__bell)
--- a/eric6/UI/SymbolsWidget.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/UI/SymbolsWidget.py Sun Feb 02 11:27:46 2020 +0100 @@ -504,7 +504,10 @@ self.symbolsTable.horizontalHeader().setSectionResizeMode( QHeaderView.Fixed) fm = self.fontMetrics() - em = fm.width("M") + try: + em = fm.horizontalAdvance("M") + except AttributeError: + em = fm.width("M") self.symbolsTable.horizontalHeader().resizeSection(0, em * 5) self.symbolsTable.horizontalHeader().resizeSection(1, em * 5) self.symbolsTable.horizontalHeader().resizeSection(2, em * 6)
--- a/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -62,7 +62,10 @@ self.bookmarksTree.setModel(self.__proxyModel) self.bookmarksTree.setExpanded(self.__proxyModel.index(0, 0), True) fm = QFontMetrics(self.font()) - header = fm.width("m") * 40 + try: + header = fm.horizontalAdvance("m") * 40 + except AttributeError: + header = fm.width("m") * 40 self.bookmarksTree.header().resizeSection(0, header) self.bookmarksTree.header().setStretchLastSection(True) self.bookmarksTree.setContextMenuPolicy(Qt.CustomContextMenu)
--- a/eric6/WebBrowser/CookieJar/CookieExceptionsModel.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/CookieJar/CookieExceptionsModel.py Sun Feb 02 11:27:46 2020 +0100 @@ -47,8 +47,12 @@ if role == Qt.SizeHintRole: fm = QFontMetrics(QFont()) height = fm.height() + fm.height() // 3 - width = fm.width( - self.headerData(section, orientation, Qt.DisplayRole)) + try: + width = fm.horizontalAdvance( + self.headerData(section, orientation, Qt.DisplayRole)) + except AttributeError: + width = fm.width( + self.headerData(section, orientation, Qt.DisplayRole)) return QSize(width, height) if orientation == Qt.Horizontal and role == Qt.DisplayRole:
--- a/eric6/WebBrowser/CookieJar/CookiesExceptionsDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/CookieJar/CookiesExceptionsDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -59,10 +59,21 @@ header = self.exceptionsTable.horizontalHeader().sectionSizeHint( section) if section == 0: - header = fm.width("averagebiglonghost.averagedomain.info") + try: + header = fm.horizontalAdvance( + "averagebiglonghost.averagedomain.info") + except AttributeError: + header = fm.width( + "averagebiglonghost.averagedomain.info") elif section == 1: - header = fm.width(self.tr("Allow For Session")) - buffer = fm.width("mm") + try: + header = fm.horizontalAdvance(self.tr("Allow For Session")) + except AttributeError: + header = fm.width(self.tr("Allow For Session")) + try: + buffer = fm.horizontalAdvance("mm") + except AttributeError: + buffer = fm.width("mm") header += buffer self.exceptionsTable.horizontalHeader().resizeSection( section, header)
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Sun Feb 02 11:27:46 2020 +0100 @@ -123,7 +123,12 @@ name = index.data(Qt.DisplayRole) leftTitleEdge = leftPos + 2 rightTitleEdge = rightPos - self.__padding - leftPosForVersion = titleMetrics.width(name) + self.__padding + try: + leftPosForVersion = ( + titleMetrics.horizontalAdvance(name) + self.__padding + ) + except AttributeError: + leftPosForVersion = titleMetrics.width(name) + self.__padding nameRect = QRect(leftTitleEdge, opt.rect.top() + self.__padding, rightTitleEdge - leftTitleEdge, titleMetrics.height()) painter.setFont(titleFont)
--- a/eric6/WebBrowser/History/HistoryDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/History/HistoryDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -63,7 +63,10 @@ self.historyTree.setModel(self.__proxyModel) self.historyTree.expandAll() fm = QFontMetrics(self.font()) - header = fm.width("m") * 40 + try: + header = fm.horizontalAdvance("m") * 40 + except AttributeError: + header = fm.width("m") * 40 self.historyTree.header().resizeSection(0, header) self.historyTree.header().resizeSection(1, header) self.historyTree.header().setStretchLastSection(True)
--- a/eric6/WebBrowser/History/HistoryMenu.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/History/HistoryMenu.py Sun Feb 02 11:27:46 2020 +0100 @@ -426,7 +426,10 @@ Private slot to populate the closed tabs menu. """ fm = self.__closedTabsMenu.fontMetrics() - maxWidth = fm.width('m') * 40 + try: + maxWidth = fm.horizontalAdvance('m') * 40 + except AttributeError: + maxWidth = fm.width('m') * 40 import WebBrowser.WebBrowserWindow self.__closedTabsMenu.clear()
--- a/eric6/WebBrowser/Passwords/PasswordsDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/Passwords/PasswordsDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -67,12 +67,24 @@ header = self.passwordsTable.horizontalHeader().sectionSizeHint( section) if section == 0: - header = fm.width("averagebiglongsitename") + try: + header = fm.horizontalAdvance("averagebiglongsitename") + except AttributeError: + header = fm.width("averagebiglongsitename") elif section == 1: - header = fm.width("averagelongusername") + try: + header = fm.horizontalAdvance("averagelongusername") + except AttributeError: + header = fm.width("averagelongusername") elif section == 2: - header = fm.width("averagelongpassword") - buffer = fm.width("mm") + try: + header = fm.horizontalAdvance("averagelongpassword") + except AttributeError: + header = fm.width("averagelongpassword") + try: + buffer = fm.horizontalAdvance("mm") + except AttributeError: + buffer = fm.width("mm") header += buffer self.passwordsTable.horizontalHeader().resizeSection( section, header)
--- a/eric6/WebBrowser/WebBrowserPage.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/WebBrowserPage.py Sun Feb 02 11:27:46 2020 +0100 @@ -9,12 +9,18 @@ """ from PyQt5.QtCore import ( - pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF + pyqtSlot, pyqtSignal, QUrl, QUrlQuery, QTimer, QEventLoop, QPoint, QPointF, + QT_VERSION ) from PyQt5.QtGui import QDesktopServices from PyQt5.QtWebEngineWidgets import ( QWebEnginePage, QWebEngineSettings, QWebEngineScript ) +try: + from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION + # __IGNORE_EXCEPTION__ +except (AttributeError, ImportError): + PYQT_WEBENGINE_VERSION = QT_VERSION from PyQt5.QtWebChannel import QWebChannel from E5Gui import E5MessageBox @@ -124,10 +130,14 @@ return False # GreaseMonkey - if ( - type_ == QWebEnginePage.NavigationTypeLinkClicked and - url.toString().endswith(".user.js") - ): + if PYQT_WEBENGINE_VERSION >= 0x50e00: # PyQtWebEngine >= 5.14.0 + navigationType = type_ in [ + QWebEnginePage.NavigationTypeLinkClicked, + QWebEnginePage.NavigationTypeRedirect + ] + else: + navigationType = type_ == QWebEnginePage.NavigationTypeLinkClicked + if navigationType and url.toString().endswith(".user.js"): WebBrowserWindow.greaseMonkeyManager().downloadScript(url) return False @@ -179,8 +189,8 @@ ) self.safeBrowsingBad.emit(threatType, "".join(threatMessages)) - result = QWebEnginePage.acceptNavigationRequest(self, url, type_, - isMainFrame) + result = QWebEnginePage.acceptNavigationRequest( + self, url, type_, isMainFrame) if result: if isMainFrame:
--- a/eric6/WebBrowser/WebBrowserTabWidget.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/WebBrowserTabWidget.py Sun Feb 02 11:27:46 2020 +0100 @@ -1134,7 +1134,10 @@ Private slot to populate the closed tabs menu. """ fm = self.__closedTabsMenu.fontMetrics() - maxWidth = fm.width('m') * 40 + try: + maxWidth = fm.horizontalAdvance('m') * 40 + except AttributeError: + maxWidth = fm.width('m') * 40 self.__closedTabsMenu.clear() index = 0
--- a/eric6/WebBrowser/WebBrowserWindow.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/WebBrowserWindow.py Sun Feb 02 11:27:46 2020 +0100 @@ -2359,8 +2359,13 @@ filtertb = self.addToolBar(self.tr("Filter")) filtertb.setObjectName("FilterToolBar") self.filterCombo = QComboBox() - self.filterCombo.setMinimumWidth( - QFontMetrics(QFont()).width("ComboBoxWithEnoughWidth")) + try: + comboWidth = QFontMetrics(QFont()).horizontalAdvance( + "ComboBoxWithEnoughWidth") + except AttributeError: + comboWidth = QFontMetrics(QFont()).width( + "ComboBoxWithEnoughWidth") + self.filterCombo.setMinimumWidth(comboWidth) filtertb.addWidget(QLabel(self.tr("Filtered by: "))) filtertb.addWidget(self.filterCombo) self.__helpEngine.setupFinished.connect(self.__setupFilterCombo)
--- a/eric6/WebBrowser/ZoomManager/ZoomValuesDialog.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/WebBrowser/ZoomManager/ZoomValuesDialog.py Sun Feb 02 11:27:46 2020 +0100 @@ -60,10 +60,21 @@ header = self.zoomValuesTable.horizontalHeader().sectionSizeHint( section) if section == 0: - header = fm.width("extraveryveryverylongsitename") + try: + header = fm.horizontalAdvance( + "extraveryveryverylongsitename") + except AttributeError: + header = fm.width( + "extraveryveryverylongsitename") elif section == 1: - header = fm.width("averagelongzoomvalue") - buffer = fm.width("mm") + try: + header = fm.horizontalAdvance("averagelongzoomvalue") + except AttributeError: + header = fm.width("averagelongzoomvalue") + try: + buffer = fm.width("mm") + except AttributeError: + buffer = fm.width("mm") header += buffer self.zoomValuesTable.horizontalHeader().resizeSection( section, header)
--- a/eric6/eric6.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6.py Sun Feb 02 11:27:46 2020 +0100 @@ -256,6 +256,9 @@ sys.excepthook = excepthook + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_browser.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_browser.py Sun Feb 02 11:27:46 2020 +0100 @@ -139,6 +139,9 @@ """ global app + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_browser.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_compare.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_compare.py Sun Feb 02 11:27:46 2020 +0100 @@ -61,6 +61,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_compare.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_configure.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_configure.py Sun Feb 02 11:27:46 2020 +0100 @@ -60,6 +60,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_configure.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_diff.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_diff.py Sun Feb 02 11:27:46 2020 +0100 @@ -53,6 +53,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_diff.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_editor.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_editor.py Sun Feb 02 11:27:46 2020 +0100 @@ -62,6 +62,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_editor.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_hexeditor.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_hexeditor.py Sun Feb 02 11:27:46 2020 +0100 @@ -60,6 +60,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_hexeditor.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_iconeditor.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_iconeditor.py Sun Feb 02 11:27:46 2020 +0100 @@ -60,6 +60,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_iconeditor.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_plugininstall.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_plugininstall.py Sun Feb 02 11:27:46 2020 +0100 @@ -52,6 +52,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_plugininstall.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_pluginrepository.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_pluginrepository.py Sun Feb 02 11:27:46 2020 +0100 @@ -52,6 +52,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_pluginrepository.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_pluginuninstall.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_pluginuninstall.py Sun Feb 02 11:27:46 2020 +0100 @@ -52,6 +52,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_pluginuninstall.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_qregexp.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_qregexp.py Sun Feb 02 11:27:46 2020 +0100 @@ -55,6 +55,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_qregexp.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_qregularexpression.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_qregularexpression.py Sun Feb 02 11:27:46 2020 +0100 @@ -55,6 +55,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_qregularexpression.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_re.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_re.py Sun Feb 02 11:27:46 2020 +0100 @@ -55,6 +55,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_re.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_shell.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_shell.py Sun Feb 02 11:27:46 2020 +0100 @@ -55,6 +55,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_shell.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_snap.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_snap.py Sun Feb 02 11:27:46 2020 +0100 @@ -52,6 +52,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_snap.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_sqlbrowser.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_sqlbrowser.py Sun Feb 02 11:27:46 2020 +0100 @@ -59,6 +59,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_sqlbrowser.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_tray.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_tray.py Sun Feb 02 11:27:46 2020 +0100 @@ -55,6 +55,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_tray.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_trpreviewer.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_trpreviewer.py Sun Feb 02 11:27:46 2020 +0100 @@ -67,6 +67,9 @@ """ global app + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_trpreviewer.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_uipreviewer.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_uipreviewer.py Sun Feb 02 11:27:46 2020 +0100 @@ -60,6 +60,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_uipreviewer.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/eric6_unittest.py Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/eric6_unittest.py Sun Feb 02 11:27:46 2020 +0100 @@ -61,6 +61,9 @@ """ Main entry point into the application. """ + from PyQt5.QtGui import QGuiApplication + QGuiApplication.setDesktopFileName("eric6_unittest.desktop") + options = [ ("--config=configDir", "use the given directory as the one containing the config files"),
--- a/eric6/i18n/eric6_cs.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_cs.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1831,32 +1831,32 @@ <translation>Přidat s&ložku</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Otevřít</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Otevřít v novém &tabu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Editovat &název</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Editovat &název</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Editovat &adresu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Smazat</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Nová složka</translation> </message> @@ -1866,22 +1866,22 @@ <translation>Stisknout pro smazání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation type="unfinished">&Natavení...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5820,17 +5820,17 @@ <translation></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Povolit</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Blokovat</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Povolit pro relaci</translation> </message> @@ -6187,7 +6187,7 @@ <translation>Odebr&at vše</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Povolit pro relaci</translation> </message> @@ -29984,445 +29984,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>The hg process did not finish within 30s.</source> - <translation>hg proces neskončil do 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <translation type="obsolete">hg proces neskončil do 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <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="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <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="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <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="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <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="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <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="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <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="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <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="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <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="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <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="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -30510,52 +30510,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation>Režim &hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation></translation> + <translation type="obsolete">Režim &hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <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> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> </context> <context> @@ -30991,65 +30981,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -31101,120 +31071,100 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <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/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -31398,7 +31348,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -31633,7 +31583,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -31643,7 +31593,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -31675,65 +31625,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <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/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -31814,52 +31744,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation>Ty&p heslo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation></translation> + <translation type="obsolete">Ty&p heslo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <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> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> </context> <context> @@ -32231,7 +32151,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> @@ -32268,55 +32188,35 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -32754,7 +32654,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -32784,17 +32684,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -32866,80 +32766,70 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation>Mód vstu&pu hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Mód vstu&pu hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <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> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>The hg process did not finish within 30s.</source> - <translation>Hg proces neskončil do 30s.</translation> + <translation type="obsolete">Hg proces neskončil do 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">Nelze spustit hg program.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -32959,63 +32849,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -33025,42 +32915,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33085,147 +32975,147 @@ <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished">Filtr</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished">Soubor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33240,148 +33130,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -33391,22 +33281,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -35414,40 +35304,35 @@ <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -35520,15 +35405,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -35546,12 +35431,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -35598,80 +35483,60 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished">chybějící</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -35709,7 +35574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -35825,12 +35690,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -36551,80 +36416,60 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation type="unfinished">Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation type="unfinished">Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation type="unfinished">Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <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> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36633,7 +36478,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36642,7 +36487,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36725,7 +36570,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial status</translation> </message> @@ -36753,140 +36598,130 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> - <translation></translation> + <translation type="obsolete">Mód ve&psání hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Obnovit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Obnovit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Stisknout pro obnovení zobrazní statusu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>přidáno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>odebráno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>nesledováno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normální</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>ignorováno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>chybějící</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>Nezapsné změny nejsou dostupné/vybrané.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>Položky mimo verzi nejsou dostupné/vybrány.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Vrátit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -36901,102 +36736,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -37006,37 +36841,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">Sloučit</translation> </message> @@ -37044,17 +36879,17 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Mercurial status úspěšně zkontrolován</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> <source>Could not start the Mercurial process.</source> - <translation>Nelze spustit Mercurial proces.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <translation type="obsolete">Nelze spustit Mercurial proces.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -37512,120 +37347,110 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation>Vstup</translation> + <translation type="obsolete">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Stisknutím odeslat vstup do hg procesu</translation> + <translation type="obsolete">Stisknutím odeslat vstup do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation>Ode&slat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation></translation> + <translation type="obsolete">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Zadejte data, která se odešlou do hg procesu</translation> + <translation type="obsolete">Zadejte data, která se odešlou do hg procesu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Mód ve&psání hesla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Mód ve&psání hesla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Mercurial sezam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Status</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>aktivní</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>ano</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <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/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -38381,7 +38206,7 @@ <translation>Stisknout pro odebrání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>Odeb&rat</translation> </message> @@ -38396,32 +38221,32 @@ <translation>Odebr&at vše</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>&Otevřít</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Otevřít v novém &tabu</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Kopírovat</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation>Otevřít v novém &tabu</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Kopírovat</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -38487,12 +38312,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -49762,7 +49587,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Uložená hesla</translation> </message> @@ -49807,7 +49632,7 @@ <translation>Skrýt hesla</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Opravdu chcete zobrazit hesla?</translation> </message> @@ -52199,17 +52024,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -56127,22 +55952,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -61406,182 +61231,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -64685,47 +64510,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -65595,7 +65420,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation type="unfinished"> <numerusform></numerusform> @@ -79726,7 +79551,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Globální proměnné</translation> </message> @@ -79746,12 +79571,12 @@ <translation type="obsolete">Typ</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Prohlížeč globálních proměnných</b><p>Toto okno zobrazuje globální proměnné debugovénho programu.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Lokální proměnné</translation> </message> @@ -79761,17 +79586,17 @@ <translation type="obsolete">Lokální</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Prohlížeč lokálních proměnných</b><p>Toto okno zobrazuje lokální proměnné debugovénho programu.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Zobrazit detaily...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> @@ -79781,7 +79606,7 @@ <translation>{0} položek</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> @@ -79791,22 +79616,22 @@ <translation type="obsolete">Složit vše</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -86110,12 +85935,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -86525,12 +86350,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -86970,7 +86795,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation> </message> @@ -87047,7 +86872,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -87073,7 +86898,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">Otevřít soubor</translation> </message> @@ -87287,7 +87112,7 @@ <translation type="unfinished">Konec</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">&Konec</translation> </message> @@ -88599,27 +88424,27 @@ <translation type="unfinished">Filtr</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished">Filtrováno: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">Nastavení</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">Nástroje</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -88629,113 +88454,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">Uložkt taby</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished">Asociovaný obsah nelze nalézt.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished">Aktualizovat index pro hledání</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished">Vyhledat dokumentaci...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished">Nefiltrováno</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">Engine nápovědy</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -88807,7 +88632,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -88847,27 +88672,27 @@ <translation type="unfinished">Zobrazit celou historii...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">Záložky</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">&Zobrazit vše</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">&Skrýt vše</translation> </message> @@ -88912,12 +88737,12 @@ <translation type="unfinished">Relace</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -88968,7 +88793,7 @@ <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="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">Exportovat klávesové zkratky</translation> </message> @@ -88988,7 +88813,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="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -89008,7 +88833,7 @@ <translation type="unfinished"><b>Import klávesových zkratek</b><p>Do aplikace se importují klávesové zkratky.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -89437,46 +89262,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -89484,12 +89309,12 @@ <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="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -89500,13 +89325,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_de.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_de.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1817,32 +1817,32 @@ <translation>&Ordner hinzufügen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>Ö&ffnen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>In neuem &Register öffnen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>&Namen editieren</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>&Namen editieren</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>&Adresse editieren</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Löschen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Neuer Ordner</translation> </message> @@ -1852,22 +1852,22 @@ <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Eigenschaften …</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation>In neuem &Fenster öffnen</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation>In neuem &privaten Fenster öffnen</translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation>In neuem &Fenster öffnen</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation>In neuem &privaten Fenster öffnen</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation>In neuem &Hintergrundregister öffnen</translation> </message> @@ -5757,17 +5757,17 @@ <translation>Status</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Erlauben</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Blocken</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Für diese Sitzung erlauben</translation> </message> @@ -6071,7 +6071,7 @@ <translation>&Alle entfernen</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Für diese Sitzung erlauben</translation> </message> @@ -27765,447 +27765,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <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/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <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="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <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="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <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="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <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="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <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="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <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="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <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="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <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="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <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="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <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="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <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="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <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="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <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="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <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="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> - <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/hg.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation>Lesezeichen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <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="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation>Mercurial-Lesezeichen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation>Mercurial-Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation>Mercurial-Lesezeichen verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <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="3736"/> - <source>Delete Bookmark</source> - <translation>Lesezeichen löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <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="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation>Mercurial-Lesezeichen löschen</translation> + <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="3768"/> + <source>Push Bookmark</source> + <translation>Lesezeichen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <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="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation>Mercurial-Lesezeichen umbenennen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation>Mercurial-Lesezeichen verschieben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation>Lesezeichen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <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="3928"/> - <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="3960"/> - <source>Push Bookmark</source> - <translation>Lesezeichen hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <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="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <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="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <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="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> @@ -28290,56 +28280,6 @@ <source>Errors</source> <translation>Fehler</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <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> </context> <context> <name>HgArchiveDialog</name> @@ -28773,67 +28713,17 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation>Eingehende Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation>Ausgehende Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <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/HgBookmarksInOutDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation>keine Lesezeichen vorhanden</translation> </message> @@ -28885,122 +28775,72 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <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/HgBookmarksListDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation>keine Lesezeichen vorhanden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation>Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation>Drücken, um die Lesezeichenanzeige zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation>Push</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <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/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation><p>Soll das Lesezeichen <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation>Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation><p>Gib einen neuen Namen für das Lesezeichen <b>{0}</b> ein:</p></translation> </message> @@ -29184,7 +29024,7 @@ <translation>„encoding“-Nachricht enthielt keine Kodierung.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation>Nachricht siehe Ausgabedialog.</translation> </message> @@ -29424,7 +29264,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation>Aufgelöst</translation> </message> @@ -29434,7 +29274,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'nicht aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation>Nicht Aufgelöst</translation> </message> @@ -29464,67 +29304,17 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation>Alt+K</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation>Drücken, um die Liste der Konflikte zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <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/HgConflictsListDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation>Unbekanter Status</translation> </message> @@ -29603,56 +29393,6 @@ <source>Errors</source> <translation>Fehler</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <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> </context> <context> <name>HgDiffDialog</name> @@ -30037,7 +29777,7 @@ <translation>Wähle die als Filter zu verwendende Kategorie</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation>Revision</translation> </message> @@ -30072,57 +29812,7 @@ <translation><b>Mercurial-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation>keine Signaturen gefunden</translation> </message> @@ -30560,7 +30250,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> @@ -30590,17 +30280,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -30670,82 +30360,22 @@ <translation><b>Mercurial-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <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/HgLogBrowserDialog.py" line="951"/> - <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/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -30765,63 +30395,63 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial-Log (Eingang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -30831,42 +30461,42 @@ <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation>Marke setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <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="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -30891,147 +30521,147 @@ <translation>Drücken, um das nächste Vorkommen zu suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <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/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <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/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation>Entwurf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation>Öffentlich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation>Ausgewählte Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <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="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation>Alle Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <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="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation>Änderungen abholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <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="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <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="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <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> @@ -31046,149 +30676,149 @@ <translation>Drücken, um in der Historie nach unten zu gehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Letzte Marke</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Zweig</b></td><td>{3}</td></tr>{4}<tr><td><b>Nachricht</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <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/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Nachfolger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation>Mit Änderungssatz zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <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="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> <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="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> <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="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation>Revisionen signieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <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="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <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="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <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="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <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="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <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="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -31198,22 +30828,22 @@ <translation><a href="save:me">Speichern</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation>Mercurial-Log (vollständig)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation>Köpfe schließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation>Schließe die ausgewählten Köpfe</translation> </message> @@ -33227,40 +32857,35 @@ <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation>Nicht gesicherte Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>Die Liste der Guards wurde verändert. Sollen die Änderungen angewendet werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation>Guards löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation>Sollen die ausgewählten Guards wirklich gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation>Guard Definitionen anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Die definierten Guards konnten nicht angelegt werden.</p><p>Ursache: {0}</p></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation>Der Mercurial-Prozess endete nicht zeitgerecht.</translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -33331,17 +32956,7 @@ <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation>Fehler: </translation> </message> @@ -33359,12 +32974,12 @@ <translation>Zeigt alle Guards aller Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> @@ -33411,82 +33026,32 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation>angewandt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation>nicht angewandt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation>geschützt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -33524,7 +33089,7 @@ <translation>Dies zeigt die Liste aller für den ausgewählten Patch zu definierenden Guards an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> @@ -33640,12 +33205,12 @@ <translation>Dies zeigt eine Liste verfügbarere Patchschlangen (aktive Patchschlange fett)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation>Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation>Drücken, um die Liste der Patchschlangen zu erneuern</translation> </message> @@ -34364,82 +33929,32 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation>Alt+K</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <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="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation>Ausgewählte Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation>Ausgewählte Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation>Alle Ablagen löschen</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <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 numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation> <numerusform>%n Datei geändert</numerusform> @@ -34447,7 +33962,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation> <numerusform>%n Zeile eingefügt</numerusform> @@ -34455,7 +33970,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation> <numerusform>%n Zeile gelöscht</numerusform> @@ -34537,7 +34052,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial-Status</translation> </message> @@ -34564,142 +34079,92 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> - <translation>Alt+P</translation> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Erneuern</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Erneuern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation>Ausgewählte Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>nicht versioniert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>ignoriert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <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/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -34714,102 +34179,102 @@ <translation>Wähle den Status anzuzeigender Einträge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation>Alle zum Einpflegen auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation>Mercurial Status des Queue-Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation>Unterschiede nebeneinander</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Es darf nur eine Datei ausgewählt werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation>Als Binärriesen hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation>Als Normale Dateien hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation>Fehlende vergessen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation>Alle vom Einpflegen abwählen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation>Alle zum Einpflegen auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation>Mercurial Status des Queue-Repositories</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation>Unterschiede nebeneinander</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation>Es darf nur eine Datei ausgewählt werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation>Als Binärriesen hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation>Als Normale Dateien hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation>Fehlende vergessen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation>Alle vom Einpflegen abwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation>Fügt die ausgewählten Dateien hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation>Fügt die ausgewählten Dateien als Binärriesen mittels der 'Large Files' Erweiterung hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation>Fügt die ausgewählten Dateien als normale Dateien mittels der 'Large Files' Erweiterung hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation>Zeigt die Unterschiede des ausgewählten Eintrages in einem separaten Dialog an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation>Unterschiede nebeneinander</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation>Zeigt die Unterschiede des ausgewählten Eintrages nebeneinander in einem separaten Dialog an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation>Macht die Änderungen an den ausgewählten Dateien rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation>Die ausgewählten fehlenden Dateien vergessen</translation> </message> @@ -34819,37 +34284,37 @@ <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation>Stellt die ausgewählten, fehlenden Dateien wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation>Passt die Spaltenbreiten aller Spalten an ihren Inhalt an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation>Merge einpflegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation>Alle zusammengeführten Änderungen einpflegen.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Passt die Spaltenbreiten aller Spalten an ihren Inhalt an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation>Merge einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation>Alle zusammengeführten Änderungen einpflegen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <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/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation>Zusammenführen</translation> </message> @@ -34857,17 +34322,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Mercurial-Status erfolgreich überprüft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation>Der Mercurial-Prozess konnte nicht gestartet werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation>{0} / {1}:{2}</translation> @@ -35318,122 +34778,72 @@ <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Kennwortmodus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Mercurial-Zweigliste</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>Process Generation Error</source> - <translation>Fehler beim Prozessstart</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <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/HgTagBranchListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>aktiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>ja</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation>Drücken, um die Liste zu aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation>Zweig schließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <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/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation>Der Zweig "default" kann nicht geschlossen werden. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation><p>Soll der Zweig <b>{0}</b> wirklich geschlossen werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation>Zweige schließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation>Sollen wirklich alle aufgeführten Zweige geschlossen werden?</translation> </message> @@ -36191,7 +35601,7 @@ <translation>Drücken, um die ausgwählten Einträge zu löschen</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>&Entfernen</translation> </message> @@ -36206,32 +35616,32 @@ <translation>&Alle entfernen</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>Ö&ffnen</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>In neuem &Register öffnen</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Kopieren</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation>In neuem &Hintergrundregister öffnen</translation> + <source>Open in New &Tab</source> + <translation>In neuem &Register öffnen</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Kopieren</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation>In neuem &Fenster öffnen</translation> + <source>Open in New &Background Tab</source> + <translation>In neuem &Hintergrundregister öffnen</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation>In neuem &Fenster öffnen</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation>In neuem &privaten Fenster öffnen</translation> </message> @@ -36297,12 +35707,12 @@ <translation>Geschlossene Tabs</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation>Alle geschlossenen Tabs wiederherstellen</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation>Liste löschen</translation> </message> @@ -47416,7 +46826,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Gespeicherte Passwörter</translation> </message> @@ -47461,7 +46871,7 @@ <translation>Passwörter ausblenden</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Sollen die Passwörter wirklich angezeigt werden?</translation> </message> @@ -49805,17 +49215,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> @@ -53734,22 +53144,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation>Alle Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation>Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <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> @@ -59024,182 +58434,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation>Neuer Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation>Aktuellen Patch aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation>Pop Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation>Push Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation>zu Patch wechseln</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation>Patch auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation>Wählen den Namen des Zielpatches aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation>Keine Patches zum Auswählen vorhanden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation>Angewandte Patches abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation>Patch umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation>Wähle den zu löschenden Patch aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation>Patch löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation>Patches zusammenfügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation>Keine Patches ausgewählt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation>Keine Patches zum Zusammenführen verfügbar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation>Guards anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation>Keine Patches verfügbar, für die Guards angezeigt werden können.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation>Guards definieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation>Keine Patches verfügbar, für die Guards definiert werden können.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation>Alle Guards löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation>Patch auswählen dessen Guards gelöscht werden sollen (für aktuellen Patch leer lassen):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation>Aktive Guards setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation>Keine Guards zur Auswahl verfügbar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation>Guards deaktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation>Neue Patchschlange anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation>Aktive Patchschlange umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation>Fehler beim Anlegen einer neuen Patchschlange.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation>Fehler beim Umbenennen der aktiven Patchschlange.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation>Patchschlange säubern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation>Patchschlange löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation>Patchschlange aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation>Fehler beim Säubern der Patchschlange.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation>Fehler beim Löschen der Patchschlange.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation>Fehler beim Setzen der aktiven Patchschlange.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation>Verfügbare Patchschlangen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation>Neues Patchschlangenrepository initialisieren</translation> </message> @@ -62351,47 +61761,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation>Aktuelle Änderungen ablegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation>Wiederherstellung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation>Wiederherstellung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <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="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation>Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <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="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> @@ -63246,7 +62656,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>Bildschirmfoto wird in einer Sekunde erstellt</numerusform> @@ -77354,22 +76764,22 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Globale Variablen</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Das Globale Variablen Fenster</b><p>Dieses Fenster zeigt die globalen Variablen des untersuchten Programmes an.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Lokale Variablen</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Das Lokale Variablen Fenster</b><p>Dieses Fenster zeigt die lokalen Variablen des untersuchten Programmes an.</p></translation> </message> @@ -77379,37 +76789,37 @@ <translation>{0} Einträge</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Zeige Details...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> - <source>Refresh</source> - <translation>Aktualisieren</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> - <source>Expand</source> - <translation>Ausklappen</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> - <source>Collapse</source> - <translation>Einklappen</translation> - </message> - <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> - <source>Collapse All</source> - <translation>Alle einklappen</translation> - </message> - <message> <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <source>Refresh</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> + <source>Expand</source> + <translation>Ausklappen</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> + <source>Collapse</source> + <translation>Einklappen</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> + <source>Collapse All</source> + <translation>Alle einklappen</translation> + </message> + <message> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation>Variablentypenfilter …</translation> </message> @@ -83706,12 +83116,12 @@ <translation> s</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation>Fragwürdige URL entdeckt</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <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> @@ -84141,12 +83551,12 @@ <translation>A&ktuelles Unterfenster schließen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation>Alle geschlossenen Tabs wiederherstellen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation>Liste löschen</translation> </message> @@ -84586,7 +83996,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation>eric6 Web-Browser</translation> </message> @@ -84663,7 +84073,7 @@ <translation><b>Neues Fenster</b><p>Dies öffnet ein neues Web-Browser Fenster im aktuellen Privatsphärenmodus.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation>Neues Privates Fenster</translation> </message> @@ -84689,7 +84099,7 @@ <translation><b>Neues Privates Fenster</b><p>Dies startet ein neues privates Web-Browser Fenster durch Starten einer neuen Web-Browser Instanz im Privatmodus.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> @@ -84903,7 +84313,7 @@ <translation>Beenden</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation>B&eenden</translation> </message> @@ -86195,27 +85605,27 @@ <translation>Filter</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation>Filter: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation>Werkzeuge</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation>VirusTotal</translation> </message> @@ -86225,114 +85635,114 @@ <translation>Aktuelle Seite prüfen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation>IP Adressenbericht</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation>Domänenbericht</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <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="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation><b>eric6 Web-Browser – {0}</b><p>Der eric6 Web-Browser ist eine kombinierte Anzeige für Hilfe- und HTML-Dateien. Er ist Bestandteil der eric6-Entwicklungsumgebung.</p><p>Er basiert auf QtWebEngine {1} und Chrome {2}.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation>Gesicherte Tabs</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation>Konnte keinen zugehörigen Inhalt finden.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation>Aktualisiere Suchindex</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation>Suche nach Dokumentation...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation>Ungefiltert</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation>Hilfe</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation>Sonstige</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation>VirusTotal-Prüfung</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <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="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <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="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <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="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation>Gib einen gültigen Domänennamen ein:</translation> </message> @@ -86404,7 +85814,7 @@ <translation>Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation>Hilfedateien (*.html *.htm *.mhtml *.mht);;PDF-Dateien (*.pdf);;CHM Dateien (*.chm);;Alle Dateien (*)</translation> </message> @@ -86444,27 +85854,27 @@ <translation>Chronik anzeigen...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation>Menüleiste</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation>Lesezeichen</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation>Lesezeichen</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation>Statusleiste</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation>Alle an&zeigen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation>Alle &ausblenden</translation> </message> @@ -86509,12 +85919,12 @@ <translation>Sitzungen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation>Möchten Sie den Web-Browser wirklich schließen?</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation>Möchten Sie den Web-Browser wirklich schließen? @@ -86566,7 +85976,7 @@ <translation><b>Tastaturkurzbefehle</b><p>Setze die Tastaturkurzbefehle der Applikation mit den bevorzugten Werten.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle exportieren</translation> </message> @@ -86586,7 +85996,7 @@ <translation><b>Tastaturkurzbefehle exportieren</b><p>Exportiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle importieren</translation> </message> @@ -86606,7 +86016,7 @@ <translation><b>Tastaturkurzbefehle importieren</b><p>Importiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Tastaturkurzbefehlsdatei (*.e4k)</translation> </message> @@ -86993,24 +86403,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -87019,24 +86429,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -87047,12 +86457,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87063,14 +86473,14 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <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="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_empty.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_empty.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1791,7 +1791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -1806,47 +1806,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> + <source>Open in New &Background Tab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> <source>Open in New &Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -5701,17 +5701,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -6015,7 +6015,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -27599,447 +27599,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -28124,56 +28114,6 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgArchiveDialog</name> @@ -28606,67 +28546,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -28716,122 +28606,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -29015,7 +28855,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -29250,7 +29090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -29260,7 +29100,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -29290,67 +29130,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -29427,56 +29217,6 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgDiffDialog</name> @@ -29847,7 +29587,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -29882,57 +29622,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -30370,7 +30060,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -30440,17 +30130,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -30460,7 +30150,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -30525,323 +30215,263 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <source>Tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <source>Pull large files for selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> - <source>Pull large files for selected revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> - <source>Push Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -30856,148 +30486,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -31007,22 +30637,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -33030,37 +32660,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -33134,17 +32759,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -33162,12 +32777,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -33212,82 +32827,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished"></translation> </message> @@ -33325,7 +32890,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -33441,12 +33006,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -34170,96 +33735,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -34335,7 +33850,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -34356,7 +33871,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -34371,12 +33886,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -34386,227 +33901,177 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> + <source>Adjust column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> + <source>Revert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> - <source>Restore missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> - <source>Adjust column sizes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> - <source>ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> - <source>all</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> - <source>There are no entries selected to be committed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> - <source>There are no unversioned entries available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> - <source>Remove</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> - <source>There are no missing entries available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> - <source>Revert</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> - <source>There are no uncommitted changes available/selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -34616,37 +34081,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished"></translation> </message> @@ -34654,17 +34119,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -35106,122 +34566,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -35976,7 +35386,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> @@ -35991,32 +35401,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> + <source>Open in New &Tab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -36082,12 +35492,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -47172,7 +46582,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -47217,7 +46627,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation type="unfinished"></translation> </message> @@ -49555,17 +48965,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> @@ -53472,22 +52882,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -58578,182 +57988,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -61852,47 +61262,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -62745,7 +62155,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation type="unfinished"> <numerusform></numerusform> @@ -76718,37 +76128,37 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> @@ -76758,22 +76168,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -83029,12 +82439,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -83472,12 +82882,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -83897,7 +83307,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -83974,7 +83384,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -84000,7 +83410,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -84240,7 +83650,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> @@ -85568,27 +84978,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -85598,118 +85008,118 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -85749,27 +85159,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished"></translation> </message> @@ -85814,12 +85224,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -85870,7 +85280,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -85890,7 +85300,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -85910,7 +85320,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -86293,35 +85703,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -86332,35 +85742,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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/eric6/i18n/eric6_en.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_en.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1791,7 +1791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -1806,47 +1806,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5708,17 +5708,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -6022,7 +6022,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -27620,447 +27620,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -28145,56 +28135,6 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgArchiveDialog</name> @@ -28627,67 +28567,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -28737,122 +28627,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -29036,7 +28876,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -29271,7 +29111,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -29281,7 +29121,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -29311,67 +29151,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -29448,56 +29238,6 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgDiffDialog</name> @@ -29868,7 +29608,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -29903,57 +29643,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -30391,7 +30081,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -30431,17 +30121,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -30516,143 +30206,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -30662,42 +30292,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -30722,147 +30352,147 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -30877,148 +30507,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -31028,22 +30658,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -33051,40 +32681,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -33155,17 +32780,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -33183,12 +32798,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -33233,82 +32848,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -33346,7 +32911,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -33462,12 +33027,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -34186,82 +33751,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation> <numerusform>%n file changed</numerusform> @@ -34269,7 +33784,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation> <numerusform>%n line inserted</numerusform> @@ -34277,7 +33792,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation> <numerusform>%n line deleted</numerusform> @@ -34359,7 +33874,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -34385,142 +33900,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation type="unfinished"></translation> </message> @@ -34535,102 +34000,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -34640,37 +34105,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished"></translation> </message> @@ -34678,17 +34143,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -35137,122 +34597,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>Process Generation Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -36007,7 +35417,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> @@ -36022,32 +35432,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> + <source>Open in New &Tab</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -36113,12 +35523,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -47212,7 +46622,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -47257,7 +46667,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation type="unfinished"></translation> </message> @@ -49596,17 +49006,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -53514,22 +52924,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -58621,182 +58031,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -61895,47 +61305,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -62788,7 +62198,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>Snapshot will be taken in %n second</numerusform> @@ -76764,32 +76174,32 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> @@ -76799,27 +76209,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -83075,12 +82485,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -83496,12 +82906,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -83941,7 +83351,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -84018,7 +83428,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -84044,7 +83454,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished"></translation> </message> @@ -84258,7 +83668,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> @@ -85550,27 +84960,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -85580,113 +84990,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -85758,7 +85168,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -85798,27 +85208,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished"></translation> </message> @@ -85863,12 +85273,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -85919,7 +85329,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -85939,7 +85349,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -85959,7 +85369,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -86342,46 +85752,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -86389,12 +85799,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -86405,13 +85815,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_es.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_es.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1814,32 +1814,32 @@ <translation>Añadir &Carpeta</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Abrir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Abrir en Nueva Pes&taña</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Editar &Nombre</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Editar &Nombre</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Editar &Dirección</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Borrar</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Nueva carpeta</translation> </message> @@ -1849,22 +1849,22 @@ <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Propiedades...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation>Abrir en Nueva &Ventana</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation>Abrir en Nueva Ventana &Privada</translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation>Abrir en Nueva &Ventana</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation>Abrir en Nueva Ventana &Privada</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation>Abrir en Nueva Pes&taña en Segundo Plano</translation> </message> @@ -5752,17 +5752,17 @@ <translation>Estado</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Permitir</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Bloquear</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Permitir para la sesión</translation> </message> @@ -6066,7 +6066,7 @@ <translation>Eliminar &Todas</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Permitir para la sesión</translation> </message> @@ -16943,64 +16943,59 @@ <context> <name>EspBackupRestoreFirmwareDialog</name> <message> - <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="14"/> - <source>Dialog</source> - <translation type="obsolete">Diálogo</translation> - </message> - <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="22"/> <source>ESP Chip Type:</source> - <translation type="unfinished">Tipo de Chip ESP:</translation> + <translation>Tipo de Chip ESP:</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="29"/> <source>Select the ESP chip type</source> - <translation type="unfinished">Seleccionar el tipo de chiop ESP</translation> + <translation>Seleccionar el tipo de chip ESP</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="52"/> <source>Firmware Size:</source> - <translation type="unfinished"></translation> + <translation>Tamaño del Firmware:</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="59"/> <source>Select the firmware size</source> - <translation type="unfinished"></translation> + <translation>Seleccionar el tamaño del firmware</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="69"/> <source>Flashmode:</source> - <translation type="unfinished"></translation> + <translation>Flashmode:</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="76"/> <source>Select the flash mode</source> - <translation type="unfinished"></translation> + <translation>Seleccionar el modo de flash</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="83"/> <source>Firmware:</source> - <translation type="unfinished">Firmware:</translation> + <translation>Firmware:</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.ui" line="93"/> <source>Enter the path of the firmware file</source> - <translation type="unfinished">Introducir la ruta del archivo patch</translation> + <translation>Introducir la ruta del archivo de firmware</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/> <source>Firmware Files (*.img);;All Files (*)</source> - <translation type="unfinished"></translation> + <translation>Archivos de Firmware (*.img);;Todos los Archivos (*)</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/> <source>Backup Firmware</source> - <translation type="unfinished"></translation> + <translation>Copia de Seguridad de Firmware</translation> </message> <message> <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/> <source>Restore Firmware</source> - <translation type="unfinished"></translation> + <translation>Restaurar Firmware</translation> </message> </context> <context> @@ -17058,47 +17053,47 @@ <message> <location filename="../MicroPython/EspDevices.py" line="263"/> <source>Backup Firmware</source> - <translation type="unfinished"></translation> + <translation>Copia de Seguridad de Firmware</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="297"/> <source>Restore Firmware</source> - <translation type="unfinished"></translation> + <translation>Restaurar Firmware</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="315"/> <source>Show Chip ID</source> - <translation type="unfinished"></translation> + <translation>Mostrar ID de Chip</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="332"/> <source>Show Flash ID</source> - <translation type="unfinished"></translation> + <translation>Mostrar ID de Flash</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="349"/> <source>Show MAC Address</source> - <translation type="unfinished"></translation> + <translation>Mostrar dirección MAC</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="263"/> <source>'esptool read_flash' Output</source> - <translation type="unfinished"></translation> + <translation>Salida de 'esptool read_flash'</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="315"/> <source>'esptool chip_id' Output</source> - <translation type="unfinished"></translation> + <translation>Salida de 'esptool chip_id'</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="332"/> <source>'esptool flash_id' Output</source> - <translation type="unfinished"></translation> + <translation>Salida de 'esptool flash_id'</translation> </message> <message> <location filename="../MicroPython/EspDevices.py" line="349"/> <source>'esptool read_mac' Output</source> - <translation type="unfinished"></translation> + <translation>Salida de 'esptool read_mac'</translation> </message> </context> <context> @@ -27772,447 +27767,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <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/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <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="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <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="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <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="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <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="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <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="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <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="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <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="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <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="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <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="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <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="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <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="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <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="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <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="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> - <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/hg.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <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="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation>Borrar Marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <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="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation>Borrar Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation>Renombrar Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation>Mover Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation>Pull de Marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <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="3736"/> - <source>Delete Bookmark</source> - <translation>Borrar Marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <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="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation>Borrar Marcador de Mercurial</translation> + <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="3768"/> + <source>Push Bookmark</source> + <translation>Push de Marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <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="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation>Renombrar Marcador de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation>Mover Marcador de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation>Pull de Marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <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="3928"/> - <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="3960"/> - <source>Push Bookmark</source> - <translation>Push de Marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <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="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <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="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <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="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <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 <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation>Abortando merge sin commit</translation> </message> @@ -28297,56 +28282,6 @@ <source>Errors</source> <translation>Errores</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <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> </context> <context> <name>HgArchiveDialog</name> @@ -28780,67 +28715,17 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation>Marcadores de Mercurial Entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation>Marcadores de Mercurial Salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <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/HgBookmarksInOutDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation>no se han encontrado marcadores</translation> </message> @@ -28892,122 +28777,72 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <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/HgBookmarksListDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation>no se han definido marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation>Pulsar para actualizar la visualización de marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation>Cambiar a</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation>Renombrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation>Hacer Push</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <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/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation><p>¿Desea realmente borrar el marcador <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation>Renombrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation><p>Introducir el nuevo nombre para el marcador <b>{0}</b>:</p></translation> </message> @@ -29191,7 +29026,7 @@ <translation>El mensaje 'encoding' no contiene ninguna codificación.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation>Para mensaje ver el diálogo de output.</translation> </message> @@ -29431,7 +29266,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation>Resolved</translation> </message> @@ -29441,7 +29276,7 @@ <translation>Pulsar para marcar las entradas seleccionadas como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation>Unresolved</translation> </message> @@ -29471,67 +29306,17 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation>Alt+E</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introducir los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation>Alt+M</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation>Pulsar para actualizar la lista de conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>Process Generation Error</source> - <translation>Error de Configuración de Página</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <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/HgConflictsListDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation>Estado Desconocido</translation> </message> @@ -29610,56 +29395,6 @@ <source>Errors</source> <translation>Errores</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation>Pulse para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <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> </context> <context> <name>HgDiffDialog</name> @@ -30044,7 +29779,7 @@ <translation>Seleccionar la categoría sobre la que filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation>Revisión</translation> </message> @@ -30079,57 +29814,7 @@ <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation>no se han encontrado firmas</translation> </message> @@ -30567,7 +30252,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -30597,17 +30282,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -30667,71 +30352,21 @@ <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <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/HgLogBrowserDialog.ui" line="213"/> <source>Branch</source> <translation>Branch</translation> @@ -30742,17 +30377,7 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> - <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/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation>No se ha podido iniciar el ejecutable de hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -30772,64 +30397,64 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation>Pulsar para actualizar la lista de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -30839,42 +30464,42 @@ <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation>Aplicar Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <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="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -30899,147 +30524,147 @@ <translation>Pulsar para encontrar la ocurrencia siguiente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <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/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <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/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation>Borrador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation>Público</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <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="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation>Hacer Push de Todos los Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <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="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation>Fetch (recuperación) de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <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="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation>Establecer marcador para la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation>Mover Marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <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="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <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> @@ -31054,149 +30679,149 @@ <translation>Pulsar para mover hacia abajo en el listado de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Último Tag</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Mensaje</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <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/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Hijos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation>Hacer merge con Chageset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation>Hacer merge del directorio de trabajo con el changeset seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation>Crear Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <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="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> <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="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> <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="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation>Firmar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <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="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation>Verificar Firmas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <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="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation>Seleccionar Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <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="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <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="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation>Hacer Fetch de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <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="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -31206,22 +30831,22 @@ <translation><a href="save:me">Guardar</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation>Registro completo de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation>Cerrar Heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation>Cerrar las heads seleccionadas</translation> </message> @@ -33235,40 +32860,35 @@ <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation>Cambios sin Guardar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>La lista de guards ha cambiado. ¿Deben aplicarse los cambios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation>Eliminar Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation>¿Desea realmente eliminar los guards seleccionados?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation>Aplicar Definiciones de Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Los guards definidos no se han podido aplicar.</p><p>Causa: {0}</p></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation>El proceso de Mercurial no terminó en plazo.</translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -33339,17 +32959,7 @@ <translation>Mensaje de Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation>Error: </translation> </message> @@ -33367,12 +32977,12 @@ <translation>Mostrar todos los guards de todos los patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation>Sin Guard</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation>no se han encontrado patches</translation> </message> @@ -33419,82 +33029,32 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation>no se han encontrado patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation>aplicado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation>con guard</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation>sin aplicar</translation> </message> @@ -33532,7 +33092,7 @@ <translation>Muestra la lista de guards definidos para el patch seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation>Sin Guard</translation> </message> @@ -33648,12 +33208,12 @@ <translation>Muestra una lista de colas disponibles (cola activa en negrita)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation>Pulsar para actualizar el listado de colas</translation> </message> @@ -34372,82 +33932,32 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation>Alt+E</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introducir los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation>Alt+M</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <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="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation>Restaurar shelve seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation>Borrar shelves seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation>Borrar todos los shelves</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <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 numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation> <numerusform>%n archivo cambiado</numerusform> @@ -34455,7 +33965,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation> <numerusform>%n línea insertada</numerusform> @@ -34463,7 +33973,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation> <numerusform>%n línea borrada</numerusform> @@ -34545,7 +34055,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -34572,142 +34082,92 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> - <translation>Alt+P</translation> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Recargar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Recargar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation>Aplicar commit a los cambios seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>eliminado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>sin seguimiento</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <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/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -34722,102 +34182,102 @@ <translation>Seleccionar el status de las entradas a mostrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation>Seleccionar todo para hacer commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation>Estado de Cola Repositorio Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation>Lado a Lado Diff</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation>Añadir como Archivo Grande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation>Añadir como Archivo Normal</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation>Olvidar elementos perdidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation>Quitar selección de todo del commit</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation>Seleccionar todo para hacer commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation>Estado de Cola Repositorio Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation>Lado a Lado Diff</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation>Se debe seleccionar solamente un archivo con cambios sin commit.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation>Añadir como Archivo Grande</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation>Añadir como Archivo Normal</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation>Olvidar elementos perdidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation>Quitar selección de todo del commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation>Añadir los archivos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation>Añadir los archivos seleccionados como archivos grandes utilizando la extensión 'Archivos Grandes'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation>Añadir los archivos seleccionados como archivos normales utilizando la extensión 'Archivos Grandes'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation>Muestra las diferencias de la entrada seleccionada en un diálogo aparte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation>Diferencias Lado A Lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation>Muestra las diferencias de la entrada seleccionada lado a lado en un diálogo aparte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation>Revierte los cambios en los archivos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation>Olvida los archivos perdidos seleccionados</translation> </message> @@ -34827,37 +34287,37 @@ <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation>Restaura los archivos perdidos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation>Ajusta el ancho de todas las columnas a sus contenidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation>Commit Merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation>Hacer commit de todos los cambios con merge.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Ajusta el ancho de todas las columnas a sus contenidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation>Commit Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation>Hacer commit de todos los cambios con merge.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation>Abortar Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <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/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation>Hacer merge</translation> </message> @@ -34865,17 +34325,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>El estado de Mercurial se ha chequeado con éxito</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation>No se pudo ejecutar el proceso Mercurial.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation>{0} / {1}:{2}</translation> @@ -35326,122 +34781,72 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> - <source>Input</source> - <translation>Input</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Pulsar para enviar el input al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Enviar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Introduzca los datos a enviar al proceso de hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Modo de contraseña</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Lista de Branches de Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>Process Generation Error</source> - <translation>Error de Generación de Proceso</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <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/HgTagBranchListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>activo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>si</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation>Pulsar para actualizar la lista</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation>Cambiar a</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation>Cerrar Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <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/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation>No se puede cerrar la branch "default". Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation><p>¿Desea realmente cerrar la branch <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation>Cerrar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation>¿Desea realmente cerrar todas las branches en la lista?</translation> </message> @@ -36199,7 +35604,7 @@ <translation>Pulse para eliminar las entradas seleccionadas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>&Eliminar</translation> </message> @@ -36214,32 +35619,32 @@ <translation>Eliminar &Todas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>&Abrir</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Abrir en Nueva Pes&taña</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Copiar</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation>Abrir en Nueva Pes&taña en Segundo Plano</translation> + <source>Open in New &Tab</source> + <translation>Abrir en Nueva Pes&taña</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Copiar</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation>Abrir en Nueva &Ventana</translation> + <source>Open in New &Background Tab</source> + <translation>Abrir en Nueva Pes&taña en Segundo Plano</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation>Abrir en Nueva &Ventana</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation>Abrir en Nueva Ventana &Privada</translation> </message> @@ -36305,12 +35710,12 @@ <translation>Pestañas Cerradas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todas las Pestañas Cerradas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation>Borrar Lista</translation> </message> @@ -47424,7 +46829,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Contraseñas Almacenadas</translation> </message> @@ -47469,7 +46874,7 @@ <translation>Ocultar Contraseñas</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>¿Realmente desea mostrar las contraseñas?</translation> </message> @@ -49812,17 +49217,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> @@ -53740,22 +53145,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation>Purgar Todos los Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation>Purgar Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>¿Desea realmente borrar los archivos no rastreados por Mercurial ?</translation> </message> @@ -58995,182 +58400,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation>Nuevo Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation>Actualizar Patch Actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation>Hacer Pop de Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation>Hacer Push de Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation>Ir al Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation>Seleccionar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation>Seleccionar el nombre del patch de destino:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation>No hay patches que seleccionar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation>Terminar Patches Aplicados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation>Renombrar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation>Seleccionar el patch a eliminar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation>Eliminar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation>Fold Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation>No hay patches seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation>No hay patches disponibles sobre los que hacer fold.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation>Listar Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation>No hay patches disponibles para los que listar guards.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation>Definir Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation>No hay patches disponibles para los que definir guards.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation>Abandonar todos los Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation>Seleccionar el patch para el que abandonar los guards (dejar en blanco para el patch actual):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation>Establecer Guards Activos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation>No hay guards disponibles para seleccionar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation>Desactivar Guards</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation>Crear Nueva Cola</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation>Renombrar Cola Activa</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation>Error al crear una nueva cola.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation>Error al renombrar la cola activa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation>Purgar Cola</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation>Borrar Cola</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation>Activar Cola</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation>Error al purgar la cola.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation>Error al borrar la cola.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation>Error al establecer la cola activa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation>Colas Disponibles</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation>Inicializando nueva cola repositorio</translation> </message> @@ -62333,47 +61738,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation>Cambios actuales de shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation>Restaurar cambios de shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation>Abortar operación de restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation>Continuar operación de restores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <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="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation>Borrar shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <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="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation>Borrar todos los shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation>¿Desea realmente eliminar todos los cambios en shelve?</translation> </message> @@ -63228,7 +62633,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>La captura de pantalla se tomará en %n segundo</numerusform> @@ -77319,32 +76724,32 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Variables Globales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Ventana de Visor de Variables Globales</b><p>Esta ventana muestra las variables globales del programa en depuración.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Variables Locales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Ventana de Visor de Variables Locales</b><p>Esta ventana muestra las variables locales del programa en depuración.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Mostrar detalles...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -77354,27 +76759,27 @@ <translation>{0} elementos</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation>Expandir</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation>Contraer</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation>Contraer Todo</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation>Fitro por Tipo de Variable...</translation> </message> @@ -83671,12 +83076,12 @@ <translation> s</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation>Detectada URL sospechosa</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <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> @@ -83926,12 +83331,12 @@ <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="529"/> <source>Select to enable the built-in PDF Viewer</source> - <translation type="unfinished"></translation> + <translation>Seleccionar para habilitar el Visor PDF interno</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="532"/> <source>Enable internal PDF Viewer</source> - <translation type="unfinished"></translation> + <translation>Habilitar Visor PDF Interno</translation> </message> </context> <context> @@ -84106,12 +83511,12 @@ <translation>Cerrar Pestaña Actua&l</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todas las Pestañas Cerradas</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation>Borrar Lista</translation> </message> @@ -84444,7 +83849,7 @@ <message> <location filename="../WebBrowser/WebBrowserView.py" line="542"/> <source>Match {0} of {1}</source> - <translation type="unfinished"></translation> + <translation>Coincidencia {0} of {1}</translation> </message> </context> <context> @@ -84551,7 +83956,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation>Navegador Web de eric6</translation> </message> @@ -84628,7 +84033,7 @@ <translation><b>Nueva Ventana</b><p>Abre una nueva ventana de navegador web en el modo de privacidad actual.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation>Nueva Ventana Privada</translation> </message> @@ -84654,7 +84059,7 @@ <translation><b>Nueva Ventana Privada</b><p>Abre una nueva ventana privada de navegador web iniciando una nueva instancia del navegador en web en modo privado.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> @@ -84868,7 +84273,7 @@ <translation>Salir</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation>&Salir</translation> </message> @@ -86160,27 +85565,27 @@ <translation>Filtro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation>Filtrado por: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation>Ajustes</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation>Herramientas</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation>VirusTotal</translation> </message> @@ -86190,114 +85595,114 @@ <translation>Analizar sitio actual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation>Informe de Dirección IP</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation>Informe de Dominio</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <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="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation><b>Navegador Web de eric6- {0}</b><p>El Navegador Web de eric6 is una combinación de navegador de archivos de ayuda y de HTML. Es parte del conjunto de herramientas de desarrollo de eric6.</p><p>Está basado en QtWebEngine {1} y Chrome {2}.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation>Pestañas Guardadas</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation>No se ha podido encontrar un contenido asociado.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation>Actualizando índice de búsqueda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation>Buscando Documentación...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation>Sin filtrar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation>Motor de Ayuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation>Otro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation>Análisis con VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <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="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <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="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <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="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation>Introducir un nombre de dominio válido:</translation> </message> @@ -86369,7 +85774,7 @@ <translation>Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation>Archivos HTML (*.html *.htm *.mhtml *.mht);;Archivos PDF (*.pdf);;Archivos CHM (*.chm);;Todos los Archivos (*)</translation> </message> @@ -86409,27 +85814,27 @@ <translation>Mostrar Todo el Historial...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation>Barra de Menú</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation>Marcadores</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation>Marcadores</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation>Barra de Estado</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation>Mo&strar todo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation>&Ocultar todo</translation> </message> @@ -86474,12 +85879,12 @@ <translation>Sesiones</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation>¿Realmente desea cerrar el navegador web?</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation>¿Desea realmente cerrar el navegador web? @@ -86531,7 +85936,7 @@ <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="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atajos de Teclado</translation> </message> @@ -86551,7 +85956,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="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation>Importar Atajos de Teclado</translation> </message> @@ -86571,7 +85976,7 @@ <translation><b>Importar Atajos de Teclado</b><p>Importar los atajos de teclado de la aplicación.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Archivo de atajos de teclado (*.e4k)</translation> </message> @@ -86957,17 +86362,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -86978,31 +86383,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -87011,12 +86416,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87033,14 +86438,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <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="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_fr.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_fr.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1850,32 +1850,32 @@ <translation>Ajouter &Répertoire</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Ouvrir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Ouvrir dans un nouvel &onglet</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Éditer &Nom</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Éditer &Nom</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Éditer &Adresse</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Nouveau répertoire</translation> </message> @@ -1885,22 +1885,22 @@ <translation>Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Propriétés...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5837,17 +5837,17 @@ <translation type="unfinished">Etat (status)</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -6179,7 +6179,7 @@ <translation type="unfinished">Supprimer tou&t</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -29227,447 +29227,442 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/hg.py" line="962"/> + <translation type="obsolete">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/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished">Supprimer le signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished">Selectionner le signet à supprimer:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished">Supprimer le signet Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished">Renommer le signet Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished">Déplacer le signet Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished">Récuperer le signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished">Sélectionner le signet à récuperer:</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished">Supprimer le signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished">Selectionner le signet à supprimer:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation type="unfinished">Supprimer le signet Mercurial</translation> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished">Envoyer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> + <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished">Renommer le signet Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished">Déplacer le signet Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished">Récuperer le signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished">Sélectionner le signet à récuperer:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished">Envoyer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished">Sélectionner le signet à envoyer:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -29755,52 +29750,37 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> + <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> </context> <context> @@ -30236,65 +30216,50 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">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/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -30346,120 +30311,105 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">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/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">Rafraichir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -30643,7 +30593,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -30879,7 +30829,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -30889,7 +30839,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -30921,65 +30871,50 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">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/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -31060,52 +30995,37 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> + <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> </context> <context> @@ -31477,7 +31397,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> @@ -31514,55 +31434,40 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">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/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -32000,7 +31905,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -32030,17 +31935,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -32112,80 +32017,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgLogBrowserDialog.py" line="951"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">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/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -32205,63 +32085,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -32271,42 +32151,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -32331,147 +32211,147 @@ <translation type="unfinished">Cliquer pour rechercher l'occurence suivante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished">Fichier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -32486,148 +32366,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished">Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -32637,22 +32517,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -34664,40 +34544,35 @@ <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -34770,15 +34645,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">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/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -34796,12 +34671,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -34848,80 +34723,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">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/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -34959,7 +34819,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -35075,12 +34935,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished">Rafraichir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -35801,80 +35661,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> + <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -35882,7 +35727,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -35890,7 +35735,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -35972,7 +35817,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -36000,140 +35845,125 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation type="unfinished">Rafraichir</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation type="unfinished">Rafraichir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation type="unfinished">Cliquer pour rafraichir l'affichage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation type="unfinished">ajouté</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation type="unfinished">modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation type="unfinished">normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation type="unfinished">ignoré</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgStatusDialog.py" line="655"/> + <translation type="obsolete">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/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">Il n'y a pas de modification non commitée disponible/sélectionnée.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">Aucune entrée "non-versionnée" disponible/sélectionnée.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -36148,102 +35978,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -36253,37 +36083,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> @@ -36291,17 +36121,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -36753,120 +36578,105 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Entrée</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Envoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">Mode Mot de &Passe</translation> + <translation type="obsolete">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation type="unfinished">Etat (status)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation type="unfinished">Erreur du processus</translation> + <translation type="obsolete">Erreur du processus</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">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/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">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/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation type="unfinished">oui</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -37622,7 +37432,7 @@ <translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation type="unfinished">Supp&rimer</translation> </message> @@ -37637,32 +37447,32 @@ <translation type="unfinished">Supprimer tou&t</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation type="unfinished">&Ouvrir</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation type="unfinished">Ouvrir dans un nouvel &onglet</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation type="unfinished">&Copier</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation type="unfinished">Ouvrir dans un nouvel &onglet</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation type="unfinished">&Copier</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -37728,12 +37538,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -48951,7 +48761,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -48996,7 +48806,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation type="unfinished"></translation> </message> @@ -51387,17 +51197,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -55316,22 +55126,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -60589,182 +60399,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -63868,47 +63678,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -64767,7 +64577,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation type="unfinished"> <numerusform></numerusform> @@ -78913,7 +78723,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Variables globales</translation> </message> @@ -78923,12 +78733,12 @@ <translation type="obsolete">Globales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Fenêtre de visualisation des variables globales</b><p>Cette fenêtre affiche les variables globales du programme débogué.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Variables locales</translation> </message> @@ -78938,7 +78748,7 @@ <translation type="obsolete">Locales</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Fenêtre de visualisation des variables locales</b><p>Cette fenêtre affiche les variables locales du programme débogué.</p></translation> </message> @@ -78953,12 +78763,12 @@ <translation type="obsolete">Type</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Afficher les détails...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Configuration...</translation> </message> @@ -78968,7 +78778,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">Rafraichir</translation> </message> @@ -78978,22 +78788,22 @@ <translation type="obsolete">Tout contracter</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -85274,12 +85084,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -85693,12 +85503,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -86138,7 +85948,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -86215,7 +86025,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -86241,7 +86051,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">Ouvrir Fichier</translation> </message> @@ -86455,7 +86265,7 @@ <translation type="unfinished">Quitter</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">&Quitter</translation> </message> @@ -87748,27 +87558,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">Outils</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">Aide</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -87778,113 +87588,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">Autre</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -87956,7 +87766,7 @@ <translation type="unfinished">Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -87996,27 +87806,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">Signets</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">Signets</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">Tout &afficher</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">Tout &masquer</translation> </message> @@ -88061,12 +87871,12 @@ <translation type="unfinished">Sessions</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -88117,7 +87927,7 @@ <translation type="unfinished"><b>Raccourcis claviers</b><p>Edite les raccourcis claviers pour l'application.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -88137,7 +87947,7 @@ <translation type="unfinished"><b>Exporter les raccourcis clavier</b><p>Exporte les raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -88157,7 +87967,7 @@ <translation type="unfinished"><b>Importer des raccourcis clavier</b><p>Importe des raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -88615,24 +88425,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -88641,23 +88451,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -88668,12 +88478,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -88684,13 +88494,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_it.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_it.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1850,32 +1850,32 @@ <translation>Aggiungi &Cartella</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Apri</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Apri in una nuova linguet&ta</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Modifica &Nome</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Modifica &Nome</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Modifica &Indirizzo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>Can&cella</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Nuova Cartella</translation> </message> @@ -1885,22 +1885,22 @@ <translation></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Proprietà...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5931,17 +5931,17 @@ <translation>Stato</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Consenti</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Blocca</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Consenti per la sessione</translation> </message> @@ -6298,7 +6298,7 @@ <translation>Rimuovi &Tutto</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Consenti per la sessione</translation> </message> @@ -31248,445 +31248,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>The hg process did not finish within 30s.</source> - <translation>Il processo hg non è finito entro i 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <translation type="obsolete">Il processo hg non è finito entro i 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <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="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <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="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <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="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <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="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <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="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <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="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <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="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <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="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished">Cancella segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <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="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished">Cancella Segnalibro Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished">Sposta Segnalibro Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished">Estrai Segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <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="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished">Cancella segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <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="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation type="unfinished">Cancella Segnalibro Mercurial</translation> + <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="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished">Inserisce Segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <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="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished">Sposta Segnalibro Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished">Estrai Segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <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="3928"/> - <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="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished">Inserisce Segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <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="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -31774,52 +31774,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <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> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> </context> <context> @@ -32255,65 +32255,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation type="unfinished">Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -32365,120 +32365,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished">Cancella</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished">Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <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/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -32662,7 +32662,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -32901,7 +32901,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -32911,7 +32911,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -32943,65 +32943,60 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation type="unfinished">Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">Errore Generazione Processo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -33082,52 +33077,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <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> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> </context> <context> @@ -33499,7 +33494,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation>Revisione</translation> </message> @@ -33536,55 +33531,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -34022,7 +34017,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -34052,17 +34047,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Autore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -34134,80 +34129,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Cancellato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <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> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>The hg process did not finish within 30s.</source> - <translation>Il processo hg non è finito entro i 30s.</translation> + <translation type="obsolete">Il processo hg non è finito entro i 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> <source>Could not start the hg executable.</source> - <translation>Non posso avviare l'eseguibile hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">Non posso avviare l'eseguibile hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -34227,63 +34222,63 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Incoming)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -34293,42 +34288,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34353,147 +34348,147 @@ <translation type="unfinished">Premi per trovare la prossima occorrenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished">Trova</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished">Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished">Recupero modifiche da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34508,148 +34503,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -34659,22 +34654,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -36687,40 +36682,35 @@ <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -36793,15 +36783,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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 percorso.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel percorso.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation>Errore: </translation> </message> @@ -36819,12 +36809,12 @@ <translation>Mostra tulle le guardie di tutte le modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation>Non gurdiato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation>Modifiche non trovate</translation> </message> @@ -36871,80 +36861,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished">Modifiche non trovate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation>mancante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -36982,7 +36972,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished">Non gurdiato</translation> </message> @@ -37098,12 +37088,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -37829,80 +37819,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <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 percorso di ricerca.</translation> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel percorso di ricerca.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -37910,7 +37900,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -37918,7 +37908,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -37995,7 +37985,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -38024,140 +38014,140 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Aggiorna</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Aggiorna</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Premi per aggiornare lo stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">Adatta dimensione colonne</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>aggiunto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>rimosso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>non tracciato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>ignorato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>mancante</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>Non ci sono modifiche disponibili/selezionate da committare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>Non ci sono elementi non sotto controllo disponibili/selezionati.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Inverti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -38172,102 +38162,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -38277,37 +38267,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">Fondi</translation> </message> @@ -38315,17 +38305,17 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Stato Mercurial controllato con successo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> <source>Could not start the Mercurial process.</source> - <translation>Non posso avviare il processo Mercurial.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <translation type="obsolete">Non posso avviare il processo Mercurial.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -38778,120 +38768,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation>Input</translation> + <translation type="obsolete">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> + <translation type="obsolete">Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Spedisci</translation> + <translation type="obsolete">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Inserisci i dati da inviare al processo hg</translation> + <translation type="obsolete">Inserisci i dati da inviare al processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> + <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Modo &Password</translation> + <translation type="obsolete">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Mercurial Branches List</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Stato</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation>Errore Generazione Processo</translation> + <translation type="obsolete">Errore Generazione Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>attivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>si</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <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/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -39648,7 +39638,7 @@ <translation>Premi per rimuovere gli elementi selezionati</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>&Rimuovi</translation> </message> @@ -39663,32 +39653,32 @@ <translation>Rimuovi &Tutto</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>&Apri</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Apri in una nuova linguet&ta</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Copia</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation>Apri in una nuova linguet&ta</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Copia</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -39754,12 +39744,12 @@ <translation>Schede chiuse</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation>Ricarica tutte le schede chiuse</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation>Pulisci lista</translation> </message> @@ -51157,7 +51147,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Password salvate</translation> </message> @@ -51202,7 +51192,7 @@ <translation>Nascondi password</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Vuoi veramente mostrare le password ?</translation> </message> @@ -53597,17 +53587,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> @@ -57526,22 +57516,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -62836,182 +62826,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation>Inizializza una nuova coda del repository</translation> </message> @@ -66131,47 +66121,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -67046,7 +67036,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>L'istantanea verrà fissata in %n secondo</numerusform> @@ -81240,7 +81230,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Variabili globali</translation> </message> @@ -81250,12 +81240,12 @@ <translation type="obsolete">Globali</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Finestra di visualizzazione delle variabili globali</b><p>Questa finestra mostra le variabili globali del programma in debug.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Variabili locali</translation> </message> @@ -81265,7 +81255,7 @@ <translation type="obsolete">Locali</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Finestra di visualizzazione delle variabili locali</b><p>Questa finestra mostra le variabili locali del programma in debug.</p></translation> </message> @@ -81280,12 +81270,12 @@ <translation type="obsolete">Tipo</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Mostra dettagli...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Configura...</translation> </message> @@ -81295,7 +81285,7 @@ <translation>{0} elementi</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> @@ -81305,22 +81295,22 @@ <translation type="obsolete">Raggruppa tutto</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -87600,12 +87590,12 @@ <translation type="unfinished"> s</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -88016,12 +88006,12 @@ <translation type="unfinished">C&hiudi scheda corrente</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">Ricarica tutte le schede chiuse</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished">Pulisci lista</translation> </message> @@ -88461,7 +88451,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished">Web Browser di eric6</translation> </message> @@ -88538,7 +88528,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -88564,7 +88554,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">Apri File</translation> </message> @@ -88778,7 +88768,7 @@ <translation type="unfinished">Esci</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">&Esci</translation> </message> @@ -90090,27 +90080,27 @@ <translation type="unfinished">Filtro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished">Filtrato per:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">Impostazioni</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">Aiuto</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -90120,113 +90110,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"><p>Non posso avviare il processo.<br>Assicurarsi sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">Salva Linguette</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished">Non posso trovare un contenuto associato.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished">Aggiornamento indice di ricerca</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished">Ricerca documentazione...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished">Non filtrato</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">Motore di help</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished">ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished">ISCII</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">Altro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -90298,7 +90288,7 @@ <translation type="unfinished">Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -90338,27 +90328,27 @@ <translation type="unfinished">Mostra tutta la cronologia...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">Segnalibri</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">Segnalibri</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">Mo&stra tutti</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">Nascondi &tutti</translation> </message> @@ -90403,12 +90393,12 @@ <translation type="unfinished">Sessioni</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -90459,7 +90449,7 @@ <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="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -90479,7 +90469,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="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -90499,7 +90489,7 @@ <translation type="unfinished"><b>Importa scorciatoie da tastiera</b><p>Importa le scorciatoie da tastiera dell'applicazione.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished">File scorciatoi tastiera (*.e4k)</translation> </message> @@ -90956,24 +90946,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -90982,24 +90972,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -91009,12 +90999,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -91031,13 +91021,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_pt.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_pt.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1847,7 +1847,7 @@ <translation>Pressionar para apagar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Apagar</translation> </message> @@ -1862,47 +1862,47 @@ <translation>Adicionar &Diretório</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>A&brir</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Abrir num &Separador Novo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Editar &Nome</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Editar &Nome</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Editar &Direção</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Diretório Novo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Propriedades...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation>Abrir numa Nova &Janela</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation>Abrir numa Nova Janela Pri&vada</translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation>Abrir numa Nova &Janela</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation>Abrir numa Nova Janela Pri&vada</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation>Abrir num Novo Separador de &Fundo</translation> </message> @@ -5935,17 +5935,17 @@ <translation>Estado</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Permitir</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Bloquear</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Permitir na Sessão</translation> </message> @@ -6302,7 +6302,7 @@ <translation>Retirar &Tudo</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Permitir na Sessão</translation> </message> @@ -30818,445 +30818,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>The hg process did not finish within 30s.</source> - <translation>O processo hg não acabou em 30s.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <translation type="obsolete">O processo hg não acabou em 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Criar repositorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>A criar repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <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="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <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="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <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="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <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="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <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="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <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="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <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="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation>Aplicar Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <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="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation>Apagar o Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation>Renomear o Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation>Mover o Marcador de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation>Puxar Marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <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="3736"/> - <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="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation>Apagar o Marcador de Mercurial</translation> + <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="3768"/> + <source>Push Bookmark</source> + <translation>Empurrar Marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <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="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation>Renomear o Marcador de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation>Mover o Marcador de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation>Puxar Marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <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="3928"/> - <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="3960"/> - <source>Push Bookmark</source> - <translation>Empurrar Marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <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="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -31344,52 +31344,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <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> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> </context> <context> @@ -31826,65 +31826,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation>Marcadores de Entrada de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation>Marcadores de Saída de Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation>sem marcadores encontrados</translation> </message> @@ -31938,120 +31938,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation>não há marcadores definidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">Atualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished">Apagar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished">Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished">Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished">Renomear Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -32235,7 +32235,7 @@ <translation>Mensagem 'encoding' não tinha nenhuma codificação.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation>Para a mensagem ver a caixa de diálogo da saída de comandos.</translation> </message> @@ -32474,7 +32474,7 @@ <translation>Pressionar para maracar as entradas selecionadas como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation>Resolvido</translation> </message> @@ -32484,7 +32484,7 @@ <translation>Pressionar para marcar as entradas selecionadas como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation>Sem resolver</translation> </message> @@ -32516,65 +32516,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation>Pressionar para atualizar a lista de conflitos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <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/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation>Estado Desconhecido</translation> </message> @@ -32656,52 +32656,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <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> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> </context> <context> @@ -33074,7 +33074,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation>Revisão</translation> </message> @@ -33111,55 +33111,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation>não se encontraram assinaturas</translation> </message> @@ -33597,7 +33597,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Registo de Mercurial</translation> </message> @@ -33637,17 +33637,17 @@ <translation>Selecionar o campo a filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Mensagem</translation> </message> @@ -33724,142 +33724,142 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Adicionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Apagado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Alterado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Tudo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>The hg process did not finish within 30s.</source> - <translation>O processo hg não acabou em 30s.</translation> + <translation type="obsolete">O processo hg não acabou em 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> <source>Could not start the hg executable.</source> - <translation>Não se pôde iniciar o executável hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">Não se pôde iniciar o executável hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <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/HgLogBrowserDialog.py" line="98"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation>Registo de Mercurial (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation>Registo de Mercurial (Sainte)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation>Alterar a fase das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Mudar Fase</b> <p>Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -33869,42 +33869,42 @@ <translation>Selecionar ação do menu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation>Etiquetar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation>Etiqueta a revisão selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation>Puxar Ficheiros Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <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="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> @@ -33929,147 +33929,147 @@ <translation>Pressionar para encontrar a ocurrência seguinte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation>Encontrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <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/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <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/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished">Rascunho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished">Público</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished">Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished">Trazer alterações de um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34084,148 +34084,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished">Verificar Assinaturas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -34235,22 +34235,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -36261,40 +36261,35 @@ <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation>Alterações Sem Gravar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -36367,15 +36362,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation>Erro:</translation> </message> @@ -36393,12 +36388,12 @@ <translation>Mostra todos os guardas de todos os remendos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation>Sem Guarda</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation>não se encontraram remendos</translation> </message> @@ -36445,80 +36440,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished">não se encontraram remendos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation>aplicado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation>a faltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -36556,7 +36551,7 @@ <translation>Mostra a lista de guardas definidos para o remendo selecionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation>Sem Guarda</translation> </message> @@ -36672,12 +36667,12 @@ <translation>Mostra uma lista das filas disponíveis (ativas em negrita)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation>Atualizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation>Pressionar para atualizar a lista de filas</translation> </message> @@ -37403,80 +37398,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <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="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation>Restaurar pilhas selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation>Apagar pilhas selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation>Apagar todas as Pilhas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <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> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation> <numerusform>um ficheiro alterado</numerusform> @@ -37484,7 +37479,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation> <numerusform>uma linha inserida</numerusform> @@ -37492,7 +37487,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation> <numerusform>uma linha apagada</numerusform> @@ -37569,7 +37564,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Estado de Mercurial</translation> </message> @@ -37598,140 +37593,140 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Atualizar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Atualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Pressionar para atualizar o visor de estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation>Cometer as alterações selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>adicionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>alterado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>retirado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>sem rastrear</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>a faltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>ignorado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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/HgStatusDialog.py" line="655"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Cometido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>Não há aterações por cometer disponíveis/selecionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>Não existem entradas sem versão disponíveis/selecionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>Não existem entradas desaparecidas disponíveis/selcionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Anular</translation> </message> @@ -37746,102 +37741,102 @@ <translation>Selecionar estado das entradas a mostrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation>Restaurar desaparecidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation>tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation>Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation>Não há entradas selecionadas a cometer.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation>Selecionar tudo para cometer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation>Estado de Fila do Repositório Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation>Diff Lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Apenas um ficheiro com alterações por cometer deve ser selecionado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished">Adicionar como Ficheiro Grande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished">Adicionar como Ficheiro Normal</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation>Esquecer desaparecidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation>Selecionar tudo para cometer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation>Estado de Fila do Repositório Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation>Diff Lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation>Apenas um ficheiro com alterações por cometer deve ser selecionado.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished">Adicionar como Ficheiro Grande</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished">Adicionar como Ficheiro Normal</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation>Esquecer desaparecidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -37851,37 +37846,37 @@ <translation type="unfinished">Selecionar ação do menu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">Mesclar</translation> </message> @@ -37889,17 +37884,17 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Estado de Mercurial verificado com êxito</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> <source>Could not start the Mercurial process.</source> - <translation>Não se pôde iniciar o processo Mercurial.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <translation type="obsolete">Não se pôde iniciar o processo Mercurial.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -38352,120 +38347,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation>Entrada</translation> + <translation type="obsolete">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Pressionar para enviar a entrada ao processo hg</translation> + <translation type="obsolete">Pressionar para enviar a entrada ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Enviar</translation> + <translation type="obsolete">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Introduzir dados a enviar ao processo hg</translation> + <translation type="obsolete">Introduzir dados a enviar ao processo hg</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>Modo &Senha</translation> + <translation type="obsolete">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Lista de Ramos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Estado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation>Erro na Criação de Processo</translation> + <translation type="obsolete">Erro na Criação de Processo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>ativo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>sim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished">Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -39223,7 +39218,7 @@ <translation>Pressionar para retirar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>&Retirar</translation> </message> @@ -39238,32 +39233,32 @@ <translation>Retirar &Tudo</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>A&brir</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Abrir num &Separador Novo</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Copiar</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished">Abrir num Novo Separador de &Fundo</translation> + <source>Open in New &Tab</source> + <translation>Abrir num &Separador Novo</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Copiar</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation type="unfinished">Abrir numa Nova &Janela</translation> + <source>Open in New &Background Tab</source> + <translation type="unfinished">Abrir num Novo Separador de &Fundo</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished">Abrir numa Nova &Janela</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished">Abrir numa Nova Janela Pri&vada</translation> </message> @@ -39329,12 +39324,12 @@ <translation>Separadores Fechados</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todos os Separadores Fechados</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation>Limpar Lista</translation> </message> @@ -50554,7 +50549,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Senhas Gravadas</translation> </message> @@ -50599,7 +50594,7 @@ <translation>Esconder Senhas</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Tem a certeza de que quer mostrar as senhas?</translation> </message> @@ -53018,17 +53013,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> @@ -56958,22 +56953,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation>Purgar Todos os Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation>Purgar Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <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> @@ -62124,182 +62119,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished">Listar Guardas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -65403,47 +65398,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation>Apagar todas as Pilhas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -66316,7 +66311,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>A instantânea será feita num segundo</numerusform> @@ -80417,7 +80412,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Variáveis Globais</translation> </message> @@ -80437,12 +80432,12 @@ <translation type="obsolete">Tipo</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Variáveis Locais</translation> </message> @@ -80452,17 +80447,17 @@ <translation type="obsolete">Locais</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Mostrar Detalhes...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Configurar...</translation> </message> @@ -80472,7 +80467,7 @@ <translation>{0} elementos</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">Atualizar</translation> </message> @@ -80482,22 +80477,22 @@ <translation type="obsolete">Contrair tudo</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -86764,12 +86759,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -87180,12 +87175,12 @@ <translation type="unfinished">F&echar o Separador Atual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">Restaurar Todos os Separadores Fechados</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished">Limpar Lista</translation> </message> @@ -87625,7 +87620,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished">Navegador Web de eric6</translation> </message> @@ -87702,7 +87697,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -87728,7 +87723,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">Abrir Ficheiro</translation> </message> @@ -87942,7 +87937,7 @@ <translation type="unfinished">Sair</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">Sai&r</translation> </message> @@ -89244,27 +89239,27 @@ <translation type="unfinished">Filtro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished">Filtrado por: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">Definições</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">Ferramentas</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">Ajuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -89274,113 +89269,113 @@ <translation type="unfinished">Analizar sítio atual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">Separadores Guardados</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished">Não se encontrou nenhum conteúdo associado.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished">A atualizar índice de pesquisa</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished">A procurar a Documentação...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished">Sem filtrar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">Motor de Ajuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished">ISCII</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">Outro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished">Análise de VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -89452,7 +89447,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -89492,27 +89487,27 @@ <translation type="unfinished">Mostrar Histórico Todo...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">Marcadores</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">Marcadores</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">&Mostrar tudo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">&Esconder tudo</translation> </message> @@ -89557,12 +89552,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -89613,7 +89608,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -89633,7 +89628,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -89653,7 +89648,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished">Ficheiro de atalhos de teclado (*.e4k)</translation> </message> @@ -90076,24 +90071,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -90102,24 +90097,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -90130,12 +90125,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90152,13 +90147,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_ru.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_ru.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1810,7 +1810,7 @@ <translation>Удалить выбранные элементы</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -1825,47 +1825,47 @@ <translation>Добавить &папку</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Открыть</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Открыть в новой &вкладке</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Редактировать &имя</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Редактировать &имя</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>Редактировать &адрес</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Новая папка</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation>Открыть в новом &окне</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation>Открыть в новом при&ватном окне</translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation>Открыть в новом &окне</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation>Открыть в новом при&ватном окне</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation>Открыть в новой &фоновой вкладке</translation> </message> @@ -5762,17 +5762,17 @@ <translation>Статус</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Разрешить</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Блокировать</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Разрешить в текущей сессии</translation> </message> @@ -6076,7 +6076,7 @@ <translation>Удалить &все</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Разрешить в текущей сессии</translation> </message> @@ -27813,447 +27813,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <source>The hg process did not finish within 30s.</source> - <translation>Процесс hg не завершился в течение 30 секунд.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation>Невозможно создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Создание Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation>Mercurial: Первичная фиксация в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation>Mercurial: Клонирование проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation>Mercurial: Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Mercurial: Добавление файлов/директорий в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <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="783"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветви в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <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="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <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="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <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="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <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="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <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="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <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="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> - <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/hg.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation>Конечная ревизия текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation>Удалить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation>Выберите закладку для удаления:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation>Mercurial: Удалить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation>Mercurial: Переименовать закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation>Mercurial: Переместить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation>Затянуть закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation>Выберите закладку для затягивания:</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation>Удалить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation>Выберите закладку для удаления:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> - <translation>Mercurial: Удалить закладку</translation> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation>Протолкнуть закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> + <translation>Выберите закладку для проталкивания:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation>Mercurial: Переименовать закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation>Mercurial: Переместить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation>Затянуть закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation>Выберите закладку для затягивания:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation>Протолкнуть закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation>Выберите закладку для проталкивания:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <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="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation>Помеченные как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Помеченные как 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в 'области резервного копирования'<b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Копировать набор изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Копировать набор изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation>Отмена незавершенного слияния</translation> </message> @@ -28338,56 +28328,6 @@ <source>Errors</source> <translation>Ошибки</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> - </message> </context> <context> <name>HgArchiveDialog</name> @@ -28820,67 +28760,17 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation>Mercurial: Входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation>Mercurial: Исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> - <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/HgBookmarksInOutDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation>закладки не найдены</translation> </message> @@ -28932,122 +28822,72 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> - <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/HgBookmarksListDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation>закладок нет</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation>Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation>Освежить закладки экрана</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation>Переключиться на</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation>Переименовать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation>Затянуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation>Протолкнуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли закладка <b>{0}</b> должна быть удалена?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation><p>Введите новое имя для закладки <b>{0}</b>:</p></translation> </message> @@ -29231,7 +29071,7 @@ <translation>Сообщение 'encoding' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation>Сообщение можно увидеть в окне вывода.</translation> </message> @@ -29470,7 +29310,7 @@ <translation>Пометить выбранные конфликты как 'решенные'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation>Решённые</translation> </message> @@ -29480,7 +29320,7 @@ <translation>Пометить выбранные конфликты как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation>Нерешённые</translation> </message> @@ -29510,67 +29350,17 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation>Освежить список конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> - <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/HgConflictsListDialog.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation>Статус неизвестен</translation> </message> @@ -29649,56 +29439,6 @@ <source>Errors</source> <translation>Ошибки</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> - </message> </context> <context> <name>HgDiffDialog</name> @@ -30083,7 +29823,7 @@ <translation>Категория для фильтрации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation>Ревизия</translation> </message> @@ -30119,57 +29859,7 @@ <p>Отображение возможных сообщений ошибок.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> - <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation>подписи не найдены</translation> </message> @@ -30607,7 +30297,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Mercurial: Журнал истории</translation> </message> @@ -30647,17 +30337,17 @@ <translation>Поле для фильтрации/поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -30732,144 +30422,84 @@ <translation><b>Mercurial: Журнал ошибок</b><p>Отображение возможных ошибок команды hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Добавлен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Удален</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Модифицирован</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> - <source>The hg process did not finish within 30s.</source> - <translation>Процесс hg не завершился в течение 30 секунд.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> - <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/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial: Журнал (входящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial: Журнал (исходящие)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation>Освежить список изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation>Фаза</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation>Изменить фазу выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Изменить фазу</b> <p>Изменение фазы выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -30879,42 +30509,42 @@ <translation>Выберите действие из меню</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation>Копировать выбранные наборы изменения в текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation>Тег</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation>Тег выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation>Переключить рабочую директорию в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation>Загрузить большие файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -30939,147 +30569,147 @@ <translation>Перейти к следующему вхождению</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation>Поиск</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <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/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <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/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation>Draft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation>Public</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation>Затянуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation>Затянуть изменения из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation>Протолкнуть выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <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="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation>Протолкнуть все изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation>Протолкнуть все изменения в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation>Получить изменения (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation>Получить изменения из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation>Срезать наборы изменений из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation>Закладка для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> @@ -31094,149 +30724,149 @@ <translation>Перейти ниже в списке сообщений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</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/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr>{4}<tr><td><b>Сообщение</b></td><td>{5}</td></tr></table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <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/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</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/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation>Слить с набором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation>Слияние рабочей директории с выбранными наборами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> <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="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> <source>Apply the currently viewed changegroup file</source> <translation>Применить просматриваемый в настоящее время файл группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation>Подписать ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation>Добавить подпись для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation>Выбрать все записи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <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="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation>Получить помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -31246,22 +30876,22 @@ <translation><a href="save:me">Сохранить</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation>Mercurial: Полный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation>Закрыть головные ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation>Закрыть выбранные головные ревизии</translation> </message> @@ -33274,40 +32904,35 @@ <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation>Несохранённые изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>Список стражей изменился. Применить изменения?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation>Удалить стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation>Вы действительно хотите удалить отмеченных стражей?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation>Применить стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Невозможно применить стражей.<br>Причина: {0}.</p></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation>Процесс Mercurial не завершен вовремя.</translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -33378,17 +33003,7 @@ <translation>Описание изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> - <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation>Ошибка: </translation> </message> @@ -33406,12 +33021,12 @@ <translation>Показать всех стражей всех патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation>Без защиты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation>патчи не найдены</translation> </message> @@ -33458,82 +33073,32 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> - <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation>патчи не найдены</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation>применено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation>с защитой</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation>не применено</translation> </message> @@ -33571,7 +33136,7 @@ <translation>Список стражей для выбранного патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation>Без защиты</translation> </message> @@ -33687,12 +33252,12 @@ <translation>Показывает имеющиеся очереди (активная очередь жирным шрифтом)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation>Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation>Освежить список очередей</translation> </message> @@ -34411,82 +33976,32 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation>Освежить список отложенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation>Восстановить выбранные отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation>Удалить выбранные отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation>Удалить все отложенные изменения</translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> - <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> - </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation> <numerusform>%n файл изменен</numerusform> @@ -34495,7 +34010,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation> <numerusform>%n строка вставлена</numerusform> @@ -34504,7 +34019,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation> <numerusform>%n строка удалена</numerusform> @@ -34587,7 +34102,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial: Статус</translation> </message> @@ -34614,137 +34129,87 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> - <source>Alt+P</source> - <translation>Alt+P</translation> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Освежить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Освежить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Освежить отображение статуса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation>Подогнать размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>модифицировано</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>не отслеживается</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>игнорировано</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> - <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/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Фиксация</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных нефиксированных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет доступных/выбранных неверсированных элементов.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation>Нет доступных/выбраных недостающих записей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Вернуть</translation> </message> @@ -34759,107 +34224,107 @@ <translation>Выберите статус записей для показа</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation>Фиксировать выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation>Восстановить отсутствующие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation>все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation>Нет выбранных записей для фиксации.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation>Выбрать все для фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation>Mercurial: Статус репозитория очереди</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation>Построчные различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation>Должен быть выбран только один файл незафиксированных изменений.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation>Добавить как большие файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation>Добавить как обычные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation>Забыть отсутствующие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation>Отменить весь выбор для фиксации</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation>Выбрать все для фиксации</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation>Mercurial: Статус репозитория очереди</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation>Построчные различия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation>Должен быть выбран только один файл незафиксированных изменений.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation>Добавить как большие файлы</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation>Добавить как обычные файлы</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation>Забыть отсутствующие</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation>Отменить весь выбор для фиксации</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation>Добавить выбранные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation>Добавить выбранные файлы как большие файлы используя плагин 'Large Files'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation>Добавить выбранные файлы как обычные файлы используя плагин 'Large Files'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation>Отображение различий выбранных записей в отдельном окне</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation>Различия построчно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation>Отображение различий выбранных записей построчно в отдельном окне</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation>Возврат изменений выбранных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation>Забыть об отмеченных отсутствующих элементах</translation> </message> @@ -34869,37 +34334,37 @@ <translation>Выберите действие из меню</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation>Восстановление выбранных отсутствующих файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation>Подогнать ширину всех колонок по их содержанию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation>Фиксировать слияние</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation>Фиксировать все объединенные изменения.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation>Подогнать ширину всех колонок по их содержанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation>Фиксировать слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation>Фиксировать все объединенные изменения.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation>Отменить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation>Отмена незавершенного слияния и потеря всех изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation>Слияние</translation> </message> @@ -34907,17 +34372,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Mercurial: Статус успешно проверен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation>Mercurial: Невозможно запустить процесс.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation>{0} / {1}:{2}</translation> @@ -35375,122 +34835,72 @@ <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> - <source>Input</source> - <translation>Ввод</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Mercurial: Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <source>Process Generation Error</source> - <translation>Ошибка при запуске процесса</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> - <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/HgTagBranchListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>active</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>да</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation>Освежить список</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation>Переключиться на</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation>Ветвь "default" не может быть закрыта. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation><p>Действительно ли ветвь <b>{0}</b> должна быть закрыта?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation>Закрыть ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation>Вы действительно хотите закрыть все перечисленные ветви?</translation> </message> @@ -36248,7 +35658,7 @@ <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>&Удалить</translation> </message> @@ -36263,32 +35673,32 @@ <translation>Удалить &все</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>&Открыть</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Открыть в новой &вкладке</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Копировать</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation>Открыть в новой &фоновой вкладке</translation> + <source>Open in New &Tab</source> + <translation>Открыть в новой &вкладке</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Копировать</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation>Открыть в новом &окне</translation> + <source>Open in New &Background Tab</source> + <translation>Открыть в новой &фоновой вкладке</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation>Открыть в новом &окне</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation>Открыть в новом при&ватном окне</translation> </message> @@ -36354,12 +35764,12 @@ <translation>Закрытые вкладки</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation>Очистить список</translation> </message> @@ -47495,7 +46905,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Сохранённые пароли</translation> </message> @@ -47540,7 +46950,7 @@ <translation>Скрыть пароли</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Вы действительно хотите показать пароли?</translation> </message> @@ -49886,17 +49296,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation> </message> @@ -53836,22 +53246,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation>Зачистить все файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <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="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation>Зачистить файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>Вы действительно хотите удалить все файлы не отслеживаемые Mercurial?</translation> </message> @@ -59158,182 +58568,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation>Новый патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation>Обновить текущий патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation>Извлечь патчи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation>Протолкнуть патчи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation>Перейти к патчу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation>Выбрать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation>Выберите имя целевого патча:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation>Нет патчей для выбора.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation>Завершить применённые патчи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation>Переименовать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation>Выберите патч для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation>Удалить патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation>Подшить патчи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation>Патчи не выбраны.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation>Нет патчей для подшивки.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation>Список стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation>Нет патчей для показа стражей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation>Определить стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation>Нет патчей для определения стражей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation>Удалить всех стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation>Выберите патч для которого удалить стражей (оставьте поле пустым чтобы использовать текущий патч):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation>Установить активных стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation>Нет стражей.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation>Деактивировать стражей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation>Создать новую очередь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation>Переименовать активную очередь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation>Ошибка при создании новой очереди.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation>Ошибка при переименовании активной очереди.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation>Зачистить очередь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation>Удалить очередь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation>Активировать очередь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation>Ошибка при очистке очереди.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation>Ошибка при удалении очереди.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation>Ошибка при активизации очереди.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation>Имеющиеся очереди</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation>Инициализация нового репозитория очередей</translation> </message> @@ -62496,47 +61906,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation>Отложить текущие изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation>Восстановить отложенные изменения (Unshelve)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation>Прервать восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation>Продолжить восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation>Выберите отложенные изменения для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation>Удалить отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation>Вы действительно хотите удалить эти отложенные изменения?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation>Удалить все отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation>Вы действительно хотите удалить все отложенные изменения?</translation> </message> @@ -63391,7 +62801,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>Снимок будет сделан через %n секунду</numerusform> @@ -77517,34 +76927,34 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Глобальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Окно показа глобальных переменных</b> <p>Это окно отображает глобальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Локальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Окно показа локальных переменных</b> <p>Это окно отображает локальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Показать подробности...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Настроить...</translation> </message> @@ -77554,27 +76964,27 @@ <translation>{0} элементов</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation>Освежить</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation>Развернуть</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation>Свернуть</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation>Фильтр типа переменных...</translation> </message> @@ -83907,12 +83317,12 @@ <translation> сек</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation>Обнаружен подозрительный URL</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <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> @@ -84344,12 +83754,12 @@ <translation>&Закрыть текущую вкладку</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation>Очистить список</translation> </message> @@ -84789,7 +84199,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation>eric6 web-браузер</translation> </message> @@ -84866,7 +84276,7 @@ <translation><b>Новое окно</b><p>Открывается новое окно web-браузера в текущем приватном режиме.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation>Новое приватное окно</translation> </message> @@ -84892,7 +84302,7 @@ <translation><b>Новое приватное окно</b><p>Открытие нового приватного окна web-бразера путем запуска нового экземпляра web-браузера в приватном режиме.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation>Открыть файл</translation> </message> @@ -85106,7 +84516,7 @@ <translation>Выход</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation>&Выход</translation> </message> @@ -86399,27 +85809,27 @@ <translation>Фильтр</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation>Фильтровать по: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation>Инструменты</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation>VirusTotal</translation> </message> @@ -86429,114 +85839,114 @@ <translation>Проверить текущий сервер</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation>Отчет IP-адреса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation>Отчет домена</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <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="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation><b>eric6 web-браузер - {0}</b><p>Eric6 web-браузер - это комбинированный браузер для отображения файлов справки и HTML. Он является частью набора инструментов среды разработки eric6.</p><p>Базируется на основе QtWebEngine {1} и Chrome {2}.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation>Сохраненные вкладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation>Невозможно найти соответствующее содержание.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation>Обновление поискового индекса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation>Идёт поиск помощи...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation>Unfiltered</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation>Движок для системы справки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation>Юникод</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation>Другое</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation>Проверка VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <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="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation>Введите действительный адрес IPv4 в четырехкомпонентой нотации с точками:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation>Данный IP-адрес приведен не в четырехкомпонентой нотации с точками.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation>Введите действительное имя домена:</translation> </message> @@ -86608,7 +86018,7 @@ <translation>Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation>Файлы HTML (*.html *.htm *.mhtml *.mht);;Файлы PDF (*.pdf);;Файлы CHM (*.chm);;Все файлы (*)</translation> </message> @@ -86648,27 +86058,27 @@ <translation>Показать всю историю...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation>Строка меню</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation>Закладки</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation>Закладки</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation>Строка состояния</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation>Показать &всё</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation>Ск&рыть всё</translation> </message> @@ -86713,12 +86123,12 @@ <translation>Сессии</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation>Вы действительно хотите закрыть веб-браузер?</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation>Вы действительно хотите закрыть веб-браузер? @@ -86770,7 +86180,7 @@ <translation><b>Горячие клавиши</b><p>Определите горячие клавиши приложения согласно вашим предпочтениям.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation>Экспорт горячих клавиш</translation> </message> @@ -86791,7 +86201,7 @@ <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation>Импорт горячиx клавиш</translation> </message> @@ -86812,7 +86222,7 @@ <p>Импортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Файл горячих клавиш (*.e4k)</translation> </message> @@ -87199,24 +86609,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -87226,24 +86636,24 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -87254,12 +86664,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <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="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87276,14 +86686,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <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="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_tr.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_tr.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1825,7 +1825,7 @@ <translation>Seçilen girişi silmek için basınız</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>&Sil</translation> </message> @@ -1840,47 +1840,47 @@ <translation>Dizin &Ekle</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>&Aç</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>Yeni Se&kmede Aç</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>Adı Düze&nle</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>Adı Düze&nle</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>&Adresi Düzenle</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>Yeni Dizin</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation type="unfinished">&Özellikler...</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5823,17 +5823,17 @@ <translation>Durum</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>Kabul etmek</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation>Engellemek</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation>Oturumu Kabul Etmek</translation> </message> @@ -6190,7 +6190,7 @@ <translation>Hepsini K&aldır</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation>Oturumu Kabul Etmek</translation> </message> @@ -30093,447 +30093,442 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <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="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <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="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <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="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <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="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -30621,52 +30616,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <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> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> </context> <context> @@ -31102,65 +31097,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -31212,120 +31207,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">Tazele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished">Sil</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished">Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <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/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -31509,7 +31504,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -31745,7 +31740,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -31755,7 +31750,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -31787,65 +31782,65 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <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/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -31926,52 +31921,52 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <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> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> </context> <context> @@ -32343,7 +32338,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished">Gözden Geçirme</translation> </message> @@ -32380,55 +32375,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -32866,7 +32861,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> @@ -32896,17 +32891,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -32983,82 +32978,72 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <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> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="112"/> @@ -33071,63 +33056,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -33137,42 +33122,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">Etiket</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33197,147 +33182,147 @@ <translation type="unfinished">Sonraki eşlişmeyi bulmak için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished">Süzgeç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished">Dosya</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <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="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33352,148 +33337,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -33503,22 +33488,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -35527,40 +35512,35 @@ <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -35633,15 +35613,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -35659,12 +35639,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -35711,80 +35691,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished">kayıp</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -35822,7 +35802,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -35938,12 +35918,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished">Tazele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -36664,80 +36644,80 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation type="unfinished">Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> <source>Press to send the input to the hg process</source> - <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation type="unfinished">&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> <source>Enter data to be sent to the hg process</source> - <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation type="unfinished">&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation type="unfinished">İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <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> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36745,7 +36725,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36753,7 +36733,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -36835,7 +36815,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation>Mercurial Durumu</translation> </message> @@ -36864,140 +36844,140 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation>Tazele</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation>Tazele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation>Durum göstergesini yenilemek için bas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">Sütün boyutunu ayarla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation>eklendi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation>değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation>kaldırılmış</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation>izlenmedi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation>kayıp</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation>normal</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation>yoksayıldı</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation>Teslimat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation>Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> @@ -37012,102 +36992,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -37117,37 +37097,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">Birleştir</translation> </message> @@ -37155,17 +37135,17 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation>Mercurial durumu başarılı olarak kontrol edildi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> <source>Could not start the Mercurial process.</source> - <translation>Mercurial işlemleri başlatılamadı.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <translation type="obsolete">Mercurial işlemleri başlatılamadı.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -37618,120 +37598,120 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation>Girdi</translation> + <translation type="obsolete">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> <source>Press to send the input to the hg process</source> - <translation>Hg işlem girdilerini göndermek için basınız</translation> + <translation type="obsolete">Hg işlem girdilerini göndermek için basınız</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation>&Gönder</translation> + <translation type="obsolete">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> <source>Alt+S</source> - <translation>Alt+S</translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> <source>Enter data to be sent to the hg process</source> - <translation>Hg işlemlerine göndermek için verileri giriniz</translation> + <translation type="obsolete">Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation>&Parola Modu</translation> + <translation type="obsolete">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation>Mercurial Branş Listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>Durum</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation>İşlem Üretecinde Hata</translation> + <translation type="obsolete">İşlem Üretecinde Hata</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation>aktif</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation>evet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <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/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -38487,7 +38467,7 @@ <translation>Seçilen girişi kaldırmak için basınız</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>Kaldı&r</translation> </message> @@ -38502,32 +38482,32 @@ <translation>Hepsini K&aldır</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>&Aç</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>Yeni Se&kmede Aç</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>&Kopyala</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation>Yeni Se&kmede Aç</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>&Kopyala</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> + <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -38593,12 +38573,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -49870,7 +49850,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation>Kaydedilmiş Parolalar</translation> </message> @@ -49915,7 +49895,7 @@ <translation>Parolaları Gizle</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>Gerçekten parolaların görünmesini istiyor musunuz?</translation> </message> @@ -52310,17 +52290,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -56238,22 +56218,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -61430,182 +61410,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -64710,47 +64690,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -65620,7 +65600,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation type="unfinished"> <numerusform></numerusform> @@ -79719,7 +79699,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>Evrensel Değişkenler</translation> </message> @@ -79739,12 +79719,12 @@ <translation type="obsolete">Tip</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>Yerel Değişkenler</translation> </message> @@ -79754,17 +79734,17 @@ <translation type="obsolete">Yereller</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>Detayları Göster...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> @@ -79774,7 +79754,7 @@ <translation>{0} madde</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">Tazele</translation> </message> @@ -79784,22 +79764,22 @@ <translation type="obsolete">Hepsini daralt</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -86068,12 +86048,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -86482,12 +86462,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> @@ -86927,7 +86907,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished">Eric5 Web Gözatıcısı {6 ?}</translation> </message> @@ -87004,7 +86984,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -87030,7 +87010,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">Dosya Aç</translation> </message> @@ -87244,7 +87224,7 @@ <translation type="unfinished">Çık</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">&Çıkış</translation> </message> @@ -88551,27 +88531,27 @@ <translation type="unfinished">Süzgeç</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished">Süzülen: </translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">Ayarlar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">Araçlar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">Yardım</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished"></translation> </message> @@ -88581,113 +88561,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"><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="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">TAMAM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">Sekmeleri Kaydet</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished">Birleştirilmiş bir içerek bulunamadı.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished">Arama index yenileniyor</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished">Dökümanlara bakılıyor...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished">Süzülmemiş</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">Yardım Motoru</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished">Evrensel kod</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">Diğer</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -88759,7 +88739,7 @@ <translation type="unfinished">Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -88799,27 +88779,27 @@ <translation type="unfinished">Tüm Geçmişi Göster...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">Yerimleri</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">Yerimleri</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">Hepsini Gö&ster</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">&Hepsini gizle</translation> </message> @@ -88864,12 +88844,12 @@ <translation type="unfinished">Oturumlar</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -88920,7 +88900,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">Kılavye Kısa Yollarını Dışa Aktar</translation> </message> @@ -88940,7 +88920,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished">Klavye kısayollarını İçe Aktar</translation> </message> @@ -88960,7 +88940,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -89399,24 +89379,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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> @@ -89425,23 +89405,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <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="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <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="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <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="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -89452,12 +89432,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -89468,13 +89448,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_zh_CN.ts Wed Jan 01 12:02:35 2020 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Sun Feb 02 11:27:46 2020 +0100 @@ -1845,32 +1845,32 @@ <translation>添加文件夹(&F)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="151"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="154"/> <source>&Open</source> <translation>打开(&O)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="153"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="156"/> <source>Open in New &Tab</source> <translation>在新选项卡中打开(&T)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="164"/> - <source>Edit &Name</source> - <translation>编辑名称(&N)</translation> - </message> - <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="167"/> + <source>Edit &Name</source> + <translation>编辑名称(&N)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="170"/> <source>Edit &Address</source> <translation>编辑地址(&A)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="172"/> <source>&Delete</source> <translation>删除(&D)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="328"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="331"/> <source>New Folder</source> <translation>新文件夹</translation> </message> @@ -1880,22 +1880,22 @@ <translation>点击删除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="173"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="176"/> <source>&Properties...</source> <translation>属性(&P)…</translation> </message> <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="161"/> + <source>Open in New &Window</source> + <translation type="unfinished">在新窗口中打开(&W)</translation> + </message> + <message> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="163"/> + <source>Open in New Pri&vate Window</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="158"/> - <source>Open in New &Window</source> - <translation type="unfinished">在新窗口中打开(&W)</translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="160"/> - <source>Open in New Pri&vate Window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="155"/> <source>Open in New &Background Tab</source> <translation type="unfinished"></translation> </message> @@ -5837,17 +5837,17 @@ <translation>状态</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="79"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="83"/> <source>Allow</source> <translation>允许</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="88"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="92"/> <source>Block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="97"/> + <location filename="../WebBrowser/CookieJar/CookieExceptionsModel.py" line="101"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -6184,7 +6184,7 @@ <translation type="unfinished">移除全部(&A)</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="64"/> + <location filename="../WebBrowser/CookieJar/CookiesExceptionsDialog.py" line="72"/> <source>Allow For Session</source> <translation type="unfinished"></translation> </message> @@ -30618,445 +30618,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>The hg process did not finish within 30s.</source> - <translation>hg 进程没有在 30 秒内结束。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>Create project repository</source> <translation>创建项目仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <source>The project repository could not be created.</source> <translation>无法创建项目仓库。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> <source>Creating Mercurial repository</source> <translation>创建 Mercurial 仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> <source>Initial commit to Mercurial repository</source> <translation>向 Mercurial 仓库进行初始提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <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="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1799"/> <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/hg.py" line="962"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Delete Bookmark</source> + <translation type="unfinished">删除书签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Delete Bookmark</source> - <translation type="unfinished">删除书签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> - <source>Select the bookmark to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> - <source>Delete Mercurial Bookmark</source> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> + <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> - <source>Rename Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3822"/> - <source>Move Mercurial Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Pull Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3916"/> - <source>Select the bookmark to be pulled:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3928"/> - <source>Pulling bookmark from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Push Bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3960"/> - <source>Select the bookmark to be push:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3972"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -31144,52 +31144,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="98"/> <source>Input</source> - <translation>输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="120"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="123"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="133"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="140"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="143"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="139"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> </context> <context> @@ -31625,65 +31615,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="84"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="106"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="109"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="112"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="119"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="126"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="129"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui" line="132"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="53"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="144"/> <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/HgBookmarksInOutDialog.py" line="179"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -31735,120 +31715,110 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="146"/> <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/HgBookmarksListDialog.py" line="187"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> <source>Delete</source> <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -32032,7 +32002,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -32268,7 +32238,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -32278,7 +32248,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -32310,65 +32280,55 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="161"/> <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/HgConflictsListDialog.py" line="254"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="190"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -32449,52 +32409,42 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation>Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> </context> <context> @@ -32866,7 +32816,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="231"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> @@ -32903,55 +32853,45 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="159"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="181"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="184"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="187"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="194"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="201"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="204"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="207"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="121"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="156"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="101"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -33389,7 +33329,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -33419,17 +33359,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -33501,80 +33441,70 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="542"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="564"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="567"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="577"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="584"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="587"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="590"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>The hg process did not finish within 30s.</source> - <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> + <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="954"/> <source>Could not start the hg executable.</source> - <translation type="unfinished">无法启动 hg 可执行程序。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="957"/> + <translation type="obsolete">无法启动 hg 可执行程序。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -33594,63 +33524,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="182"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="109"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="268"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="270"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="266"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2000"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -33660,42 +33590,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="257"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> <source>Tag</source> <translation type="unfinished">标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="278"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2072"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="288"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33720,147 +33650,147 @@ <translation type="unfinished">点击查找下一次出现</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Filter</source> <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2205"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2170"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2251"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="293"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="301"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2095"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2119"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33875,148 +33805,148 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/> <source>Merge with Changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> <source>Merge the working directory with the selected changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2343"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="353"/> - <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"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/> - <source>Apply Changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="358"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="363"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1369"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1380"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1521"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2539"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2555"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2580"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2690"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2707"/> <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="2980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2723"/> <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> @@ -34026,22 +33956,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2528"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> <source>Close Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> <source>Close the selected heads</source> <translation type="unfinished"></translation> </message> @@ -36054,40 +35984,35 @@ <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> - <source>The Mercurial process did not finish in time.</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgQueuesFoldDialog</name> @@ -36160,15 +36085,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="109"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="122"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -36186,12 +36111,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -36238,80 +36163,70 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="149"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="198"/> <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/QueuesExtension/HgQueuesListDialog.py" line="233"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="155"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="49"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="210"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -36349,7 +36264,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -36465,12 +36380,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -37191,94 +37106,84 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="55"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="50"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="52"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="61"/> <source>Restore selected shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="63"/> <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="65"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="188"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="282"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="284"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="286"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -37359,7 +37264,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="311"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -37387,140 +37292,130 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="180"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="202"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="205"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="208"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="215"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="222"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="225"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="228"/> <source>Alt+P</source> - <translation type="unfinished">Alt+P</translation> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="52"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="54"/> - <source>Refresh</source> - <translation type="unfinished">刷新</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> <source>Press to refresh the status display</source> <translation type="unfinished">点击刷新状态显示</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> <source>Adjust column sizes</source> <translation type="unfinished">调整列宽</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>not tracked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> <source>normal</source> <translation type="unfinished">标准</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>ignored</source> <translation type="unfinished">已忽略</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="381"/> <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/HgStatusDialog.py" line="655"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="672"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="570"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="593"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="634"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -37535,102 +37430,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="428"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="652"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="506"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <source>Select all for commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="308"/> + <source>Mercurial Queue Repository Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="679"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="169"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Unselect all from commit</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> - <source>Select all for commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="326"/> - <source>Mercurial Queue Repository Status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Side-by-Side Diff</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="828"/> - <source>Only one file with uncommitted changes must be selected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> - <source>Add as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> - <source>Add as Normal Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="178"/> - <source>Forget missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="137"/> - <source>Unselect all from commit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>Add the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="138"/> <source>Add the selected files as a large files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>Add the selected files as a normal files using the 'Large Files' extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> <source>Shows the differences of the selected entry in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>Differences Side-By-Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>Shows the differences of the selected entry side-by-side in a separate dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> <source>Reverts the changes of the selected files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="171"/> <source>Forgets about the selected missing files</source> <translation type="unfinished"></translation> </message> @@ -37640,37 +37535,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="175"/> <source>Restores the selected missing files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> - <source>Adjusts the width of all columns to their contents</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> - <source>Commit Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>Adjusts the width of all columns to their contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <source>Commit all the merged changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="184"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="773"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -37678,17 +37573,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="182"/> - <source>Could not start the Mercurial process.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="136"/> <source>{0} / {1}:{2}</source> <comment>branch, local id, global id</comment> <translation type="unfinished"></translation> @@ -38133,120 +38023,110 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="101"/> <source>Input</source> - <translation type="unfinished">输入</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="123"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> <source>&Send</source> - <translation type="unfinished">发送(&S)</translation> + <translation type="obsolete">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="136"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="143"/> <source>Select to switch the input field to password mode</source> - <translation type="unfinished">选择将输入区域转换成密码模式</translation> + <translation type="obsolete">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> <source>&Password Mode</source> - <translation type="unfinished">密码模式(&P)</translation> + <translation type="obsolete">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <translation type="obsolete">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> <source>Status</source> <translation>状态</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> - <translation type="unfinished">进程生成错误</translation> + <translation type="obsolete">进程生成错误</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <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/HgTagBranchListDialog.py" line="292"/> + <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> <source>yes</source> <translation type="unfinished">是</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="465"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -39002,7 +38882,7 @@ <translation>点击移除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="120"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="123"/> <source>&Remove</source> <translation>移除(&R)</translation> </message> @@ -39017,32 +38897,32 @@ <translation>移除全部(&A)</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="103"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> <source>&Open</source> <translation>打开(&O)</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="106"/> - <source>Open in New &Tab</source> - <translation>在新选项卡中打开(&T)</translation> - </message> - <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="119"/> - <source>&Copy</source> - <translation>复制(&C)</translation> - </message> - <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="109"/> - <source>Open in New &Background Tab</source> - <translation type="unfinished"></translation> + <source>Open in New &Tab</source> + <translation>在新选项卡中打开(&T)</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="122"/> + <source>&Copy</source> + <translation>复制(&C)</translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="112"/> - <source>Open in New &Window</source> - <translation>在新窗口中打开(&W)</translation> + <source>Open in New &Background Tab</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/History/HistoryDialog.py" line="115"/> + <source>Open in New &Window</source> + <translation>在新窗口中打开(&W)</translation> + </message> + <message> + <location filename="../WebBrowser/History/HistoryDialog.py" line="118"/> <source>Open in New Pri&vate Window</source> <translation type="unfinished"></translation> </message> @@ -39108,12 +38988,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="444"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryMenu.py" line="447"/> + <location filename="../WebBrowser/History/HistoryMenu.py" line="450"/> <source>Clear List</source> <translation type="unfinished">清空列表</translation> </message> @@ -50471,7 +50351,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -50516,7 +50396,7 @@ <translation>隐藏密码</translation> </message> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="90"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="102"/> <source>Do you really want to show passwords?</source> <translation>确认要显示密码？</translation> </message> @@ -52926,17 +52806,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1619"/> + <location filename="../Preferences/__init__.py" line="1621"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1647"/> + <location filename="../Preferences/__init__.py" line="1649"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -56853,22 +56733,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -62140,182 +62020,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="830"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -65435,47 +65315,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -66394,7 +66274,7 @@ <context> <name>SnapshotTimer</name> <message numerus="yes"> - <location filename="../Snapshot/SnapshotTimer.py" line="107"/> + <location filename="../Snapshot/SnapshotTimer.py" line="110"/> <source>Snapshot will be taken in %n seconds</source> <translation> <numerusform>快照将在 %n 秒后截取</numerusform> @@ -80563,7 +80443,7 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="955"/> + <location filename="../Debugger/VariablesViewer.py" line="958"/> <source>Global Variables</source> <translation>全局变量</translation> </message> @@ -80583,12 +80463,12 @@ <translation type="obsolete">类型</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="956"/> + <location filename="../Debugger/VariablesViewer.py" line="959"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="962"/> + <location filename="../Debugger/VariablesViewer.py" line="965"/> <source>Local Variables</source> <translation>局部变量</translation> </message> @@ -80598,17 +80478,17 @@ <translation type="obsolete">局部</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="963"/> + <location filename="../Debugger/VariablesViewer.py" line="966"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>局部变量浏览器窗口</b><p>该窗口显示高度程序的局部变量。</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1080"/> + <location filename="../Debugger/VariablesViewer.py" line="1083"/> <source>Show Details...</source> <translation>显示细节…</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1095"/> + <location filename="../Debugger/VariablesViewer.py" line="1098"/> <source>Configure...</source> <translation>配置…</translation> </message> @@ -80618,7 +80498,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1093"/> + <location filename="../Debugger/VariablesViewer.py" line="1096"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> @@ -80628,22 +80508,22 @@ <translation type="obsolete">折叠所有</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1082"/> + <location filename="../Debugger/VariablesViewer.py" line="1085"/> <source>Expand</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1083"/> + <location filename="../Debugger/VariablesViewer.py" line="1086"/> <source>Collapse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1084"/> + <location filename="../Debugger/VariablesViewer.py" line="1087"/> <source>Collapse All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="1096"/> + <location filename="../Debugger/VariablesViewer.py" line="1099"/> <source>Variables Type Filter...</source> <translation type="unfinished"></translation> </message> @@ -86922,12 +86802,12 @@ <translation type="unfinished"> 秒</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source>Suspicuous URL detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="161"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished"></translation> </message> @@ -87336,12 +87216,12 @@ <translation type="unfinished">关闭当前选项卡(&C)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1149"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1152"/> <source>Restore All Closed Tabs</source> <translation type="unfinished">恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1151"/> + <location filename="../WebBrowser/WebBrowserTabWidget.py" line="1154"/> <source>Clear List</source> <translation type="unfinished">清空列表</translation> </message> @@ -87781,7 +87661,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3641"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3646"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> @@ -87858,7 +87738,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>New Private Window</source> <translation type="unfinished"></translation> </message> @@ -87884,7 +87764,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>Open File</source> <translation type="unfinished">打开文件</translation> </message> @@ -88098,7 +87978,7 @@ <translation type="unfinished">退出</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2916"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2921"/> <source>&Quit</source> <translation type="unfinished">退出(&Q)</translation> </message> @@ -89390,27 +89270,27 @@ <translation type="unfinished">过滤器</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2364"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2369"/> <source>Filtered by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2372"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2377"/> <source>Settings</source> <translation type="unfinished">设置</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2385"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2390"/> <source>Tools</source> <translation type="unfinished">工具</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2394"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2399"/> <source>Help</source> <translation type="unfinished">帮助</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2401"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2406"/> <source>VirusTotal</source> <translation type="unfinished">VirusTotal</translation> </message> @@ -89420,113 +89300,113 @@ <translation type="unfinished">扫描当前站点</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>IP Address Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Domain Report</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"><p>无法启动进程。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2532"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2537"/> <source>OK</source> <translation type="unfinished">确定</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2606"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2611"/> <source><b>eric6 Web Browser - {0}</b><p>The eric6 Web Browser is a combined help file and HTML browser. It is part of the eric6 development toolset.</p><p>It is based on QtWebEngine {1} and Chrome {2}.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2729"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2734"/> <source>Saved Tabs</source> <translation type="unfinished">已保存的选项卡</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3462"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3467"/> <source>Could not find an associated content.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3557"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3562"/> <source>Updating search index</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3631"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3636"/> <source>Looking for Documentation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3661"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3666"/> <source>Unfiltered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3678"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3683"/> <source>Help Engine</source> <translation type="unfinished">帮助引擎</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4236"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4241"/> <source>ISO</source> <translation type="unfinished">ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4240"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4245"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4238"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4243"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4246"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4251"/> <source>Other</source> <translation type="unfinished">其它</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source>VirusTotal Scan</source> <translation type="unfinished">VirusTotal 扫描</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4670"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4675"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4696"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4701"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4705"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4710"/> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4715"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4720"/> <source>Enter a valid domain name:</source> <translation type="unfinished"></translation> </message> @@ -89598,7 +89478,7 @@ <translation type="unfinished">Alt+Ctrl+A</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2565"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2570"/> <source>HTML Files (*.html *.htm *.mhtml *.mht);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -89638,27 +89518,27 @@ <translation type="unfinished">显示所有历史记录…</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4271"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> <source>Menu Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4276"/> - <source>Bookmarks</source> - <translation type="unfinished">书签</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4281"/> + <source>Bookmarks</source> + <translation type="unfinished">书签</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4286"/> <source>Status Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4295"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4300"/> <source>&Show all</source> <translation type="unfinished">全部显示(&S)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4297"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4302"/> <source>&Hide all</source> <translation type="unfinished">全部隐藏(&H)</translation> </message> @@ -89703,12 +89583,12 @@ <translation type="unfinished">会话</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="2907"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="2912"/> <source>Are you sure you want to close the web browser? You have {0} windows with {1} tabs open.</source> <translation type="unfinished"></translation> @@ -89759,7 +89639,7 @@ <translation type="unfinished"><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5075"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5080"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">导出键盘快捷键</translation> </message> @@ -89779,7 +89659,7 @@ <translation type="unfinished"><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished">导入键盘快捷键</translation> </message> @@ -89799,7 +89679,7 @@ <translation type="unfinished"><b>导入键盘快捷键</b><p>导入程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5099"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5104"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished">键盘快捷键文件 (*.e4k)</translation> </message> @@ -90229,46 +90109,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> <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"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <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> @@ -90276,12 +90156,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90292,13 +90172,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
