Mercurial Repositories > eric / changeset
changeset
Added support for the Mercurial histedit extension.
Sat, 29 Oct 2016 19:28:04 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 29 Oct 2016 19:28:04 +0200
- changeset 5283
- 06423d65a2b8
- parent 5282
- 898b0dda21e1
- child 5284
- 3a2f9bee8974
Added support for the Mercurial histedit extension.
--- a/APIs/Python3/eric6.api Sat Oct 29 16:22:35 2016 +0200 +++ b/APIs/Python3/eric6.api Sat Oct 29 19:28:04 2016 +0200 @@ -4792,7 +4792,7 @@ 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) +eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir=None, showArgs=True, environment={}) eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog?1(text, hg=None, useClient=True, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.closeEvent?4(e) eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_buttonBox_clicked?4(button) @@ -5013,6 +5013,43 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog?1(parent=None, host="", fingerprint="") eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="") +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_accepted?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_rejected?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_recentComboBox_activated?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor?1(fileName, parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_bookmarkButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_branch1Button_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_branchCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_defaultButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_idButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_idEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_numberSpinBox_valueChanged?4(val) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_outgoingButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_revisionButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_tagButton_toggled?4(checked) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog.on_tagCombo_editTextChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.HgHisteditConfigDialog?1(tagsList, branchesList, bookmarksList=None, rev="", parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.createMainWidget?4(argv) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.main?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanActionComboBox.showPopup?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanActionComboBox?1(item, column) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor.on_buttonBox_accepted?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor.on_buttonBox_rejected?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor.on_downButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged?4(current, previous) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor.on_upButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.HgHisteditPlanEditor?1(fileName, parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.HisteditProjectHelper.initActions?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.HisteditProjectHelper.initMenu?4(mainMenu) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.HisteditProjectHelper.menuTitle?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.HisteditProjectHelper?1() +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.Histedit.hgHisteditAbort?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.Histedit.hgHisteditContinue?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.Histedit.hgHisteditEditPlan?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.Histedit.hgHisteditStart?4(name, rev="") +eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.Histedit?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.LfConvertDataDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.LfConvertDataDialog.on_newProjectPicker_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.LfConvertDataDialog?1(currentPath, mode, parent=None)
--- a/APIs/Python3/eric6.bas Sat Oct 29 16:22:35 2016 +0200 +++ b/APIs/Python3/eric6.bas Sat Oct 29 19:28:04 2016 +0200 @@ -363,6 +363,10 @@ HgGpgSignDialog QDialog Ui_HgGpgSignDialog HgGpgSignaturesDialog QDialog Ui_HgGpgSignaturesDialog HgGraftDialog QDialog Ui_HgGraftDialog +HgHisteditCommitEditor QDialog Ui_HgHisteditCommitEditor +HgHisteditConfigDialog QDialog Ui_HgHisteditConfigDialog +HgHisteditPlanActionComboBox QComboBox +HgHisteditPlanEditor QDialog Ui_HgHisteditPlanEditor HgImportDialog QDialog Ui_HgImportDialog HgLogBrowserDialog QWidget Ui_HgLogBrowserDialog HgLogDialog QWidget Ui_HgLogDialog @@ -404,6 +408,8 @@ HgUserConfigHostFingerprintDialog QDialog Ui_HgUserConfigHostFingerprintDialog HighlightingStylesReader XMLStreamReaderBase HighlightingStylesWriter XMLStreamWriterBase +Histedit HgExtension +HisteditProjectHelper HgExtensionProjectHelper HistoryCompleter QCompleter HistoryCompletionModel QSortFilterProxyModel HistoryCompletionView QTableView
--- a/Documentation/Help/source.qhp Sat Oct 29 16:22:35 2016 +0200 +++ b/Documentation/Help/source.qhp Sat Oct 29 19:28:04 2016 +0200 @@ -523,6 +523,14 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html" /> </section> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html"> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html" /> + </section> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html"> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html" /> @@ -7448,6 +7456,50 @@ <keyword name="HgGraftDialog.on_revisionsEdit_textChanged" id="HgGraftDialog.on_revisionsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_revisionsEdit_textChanged" /> <keyword name="HgGraftDialog.on_userEdit_textChanged" id="HgGraftDialog.on_userEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_userEdit_textChanged" /> <keyword name="HgGraftDialog.on_userGroup_toggled" id="HgGraftDialog.on_userGroup_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_userGroup_toggled" /> + <keyword name="HgHisteditCommitEditor" id="HgHisteditCommitEditor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor" /> + <keyword name="HgHisteditCommitEditor (Constructor)" id="HgHisteditCommitEditor (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor.__init__" /> + <keyword name="HgHisteditCommitEditor (Module)" id="HgHisteditCommitEditor (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html" /> + <keyword name="HgHisteditCommitEditor.__readFile" id="HgHisteditCommitEditor.__readFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor.__readFile" /> + <keyword name="HgHisteditCommitEditor.on_buttonBox_accepted" id="HgHisteditCommitEditor.on_buttonBox_accepted" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor.on_buttonBox_accepted" /> + <keyword name="HgHisteditCommitEditor.on_buttonBox_rejected" id="HgHisteditCommitEditor.on_buttonBox_rejected" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor.on_buttonBox_rejected" /> + <keyword name="HgHisteditCommitEditor.on_recentComboBox_activated" id="HgHisteditCommitEditor.on_recentComboBox_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html#HgHisteditCommitEditor.on_recentComboBox_activated" /> + <keyword name="HgHisteditConfigDialog" id="HgHisteditConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog" /> + <keyword name="HgHisteditConfigDialog (Constructor)" id="HgHisteditConfigDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.__init__" /> + <keyword name="HgHisteditConfigDialog (Module)" id="HgHisteditConfigDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html" /> + <keyword name="HgHisteditConfigDialog.__getRevision" id="HgHisteditConfigDialog.__getRevision" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.__getRevision" /> + <keyword name="HgHisteditConfigDialog.__updateOK" id="HgHisteditConfigDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.__updateOK" /> + <keyword name="HgHisteditConfigDialog.getData" id="HgHisteditConfigDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.getData" /> + <keyword name="HgHisteditConfigDialog.on_bookmarkButton_toggled" id="HgHisteditConfigDialog.on_bookmarkButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_bookmarkButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged" id="HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgHisteditConfigDialog.on_branch1Button_toggled" id="HgHisteditConfigDialog.on_branch1Button_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_branch1Button_toggled" /> + <keyword name="HgHisteditConfigDialog.on_branchCombo_editTextChanged" id="HgHisteditConfigDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgHisteditConfigDialog.on_defaultButton_toggled" id="HgHisteditConfigDialog.on_defaultButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_defaultButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_idButton_toggled" id="HgHisteditConfigDialog.on_idButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_idButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_idEdit_textChanged" id="HgHisteditConfigDialog.on_idEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_idEdit_textChanged" /> + <keyword name="HgHisteditConfigDialog.on_numberSpinBox_valueChanged" id="HgHisteditConfigDialog.on_numberSpinBox_valueChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_numberSpinBox_valueChanged" /> + <keyword name="HgHisteditConfigDialog.on_outgoingButton_toggled" id="HgHisteditConfigDialog.on_outgoingButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_outgoingButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_revisionButton_toggled" id="HgHisteditConfigDialog.on_revisionButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_revisionButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_tagButton_toggled" id="HgHisteditConfigDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_tagButton_toggled" /> + <keyword name="HgHisteditConfigDialog.on_tagCombo_editTextChanged" id="HgHisteditConfigDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html#HgHisteditConfigDialog.on_tagCombo_editTextChanged" /> + <keyword name="HgHisteditEditor (Module)" id="HgHisteditEditor (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html" /> + <keyword name="HgHisteditPlanActionComboBox" id="HgHisteditPlanActionComboBox" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanActionComboBox" /> + <keyword name="HgHisteditPlanActionComboBox (Constructor)" id="HgHisteditPlanActionComboBox (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanActionComboBox.__init__" /> + <keyword name="HgHisteditPlanActionComboBox.__changeItem" id="HgHisteditPlanActionComboBox.__changeItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanActionComboBox.__changeItem" /> + <keyword name="HgHisteditPlanActionComboBox.showPopup" id="HgHisteditPlanActionComboBox.showPopup" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanActionComboBox.showPopup" /> + <keyword name="HgHisteditPlanEditor" id="HgHisteditPlanEditor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor" /> + <keyword name="HgHisteditPlanEditor (Constructor)" id="HgHisteditPlanEditor (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__init__" /> + <keyword name="HgHisteditPlanEditor (Module)" id="HgHisteditPlanEditor (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html" /> + <keyword name="HgHisteditPlanEditor.__addActionCombo" id="HgHisteditPlanEditor.__addActionCombo" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__addActionCombo" /> + <keyword name="HgHisteditPlanEditor.__assembleEditPlan" id="HgHisteditPlanEditor.__assembleEditPlan" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__assembleEditPlan" /> + <keyword name="HgHisteditPlanEditor.__createPlanItem" id="HgHisteditPlanEditor.__createPlanItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__createPlanItem" /> + <keyword name="HgHisteditPlanEditor.__readFile" id="HgHisteditPlanEditor.__readFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__readFile" /> + <keyword name="HgHisteditPlanEditor.__resizeSections" id="HgHisteditPlanEditor.__resizeSections" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__resizeSections" /> + <keyword name="HgHisteditPlanEditor.__updateButtons" id="HgHisteditPlanEditor.__updateButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.__updateButtons" /> + <keyword name="HgHisteditPlanEditor.on_buttonBox_accepted" id="HgHisteditPlanEditor.on_buttonBox_accepted" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.on_buttonBox_accepted" /> + <keyword name="HgHisteditPlanEditor.on_buttonBox_rejected" id="HgHisteditPlanEditor.on_buttonBox_rejected" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.on_buttonBox_rejected" /> + <keyword name="HgHisteditPlanEditor.on_downButton_clicked" id="HgHisteditPlanEditor.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.on_downButton_clicked" /> + <keyword name="HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged" id="HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged" /> + <keyword name="HgHisteditPlanEditor.on_upButton_clicked" id="HgHisteditPlanEditor.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html#HgHisteditPlanEditor.on_upButton_clicked" /> <keyword name="HgImportDialog" id="HgImportDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog" /> <keyword name="HgImportDialog (Constructor)" id="HgImportDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.__init__" /> <keyword name="HgImportDialog (Module)" id="HgImportDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> @@ -8050,6 +8102,22 @@ <keyword name="HighlightingStylesWriter (Constructor)" id="HighlightingStylesWriter (Constructor)" ref="eric6.E5XML.HighlightingStylesWriter.html#HighlightingStylesWriter.__init__" /> <keyword name="HighlightingStylesWriter (Module)" id="HighlightingStylesWriter (Module)" ref="eric6.E5XML.HighlightingStylesWriter.html" /> <keyword name="HighlightingStylesWriter.writeXML" id="HighlightingStylesWriter.writeXML" ref="eric6.E5XML.HighlightingStylesWriter.html#HighlightingStylesWriter.writeXML" /> + <keyword name="Histedit" id="Histedit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit" /> + <keyword name="Histedit (Constructor)" id="Histedit (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit.__init__" /> + <keyword name="Histedit.hgHisteditAbort" id="Histedit.hgHisteditAbort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit.hgHisteditAbort" /> + <keyword name="Histedit.hgHisteditContinue" id="Histedit.hgHisteditContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit.hgHisteditContinue" /> + <keyword name="Histedit.hgHisteditEditPlan" id="Histedit.hgHisteditEditPlan" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit.hgHisteditEditPlan" /> + <keyword name="Histedit.hgHisteditStart" id="Histedit.hgHisteditStart" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html#Histedit.hgHisteditStart" /> + <keyword name="HisteditExtension (Package)" id="HisteditExtension (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html" /> + <keyword name="HisteditProjectHelper" id="HisteditProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper" /> + <keyword name="HisteditProjectHelper (Constructor)" id="HisteditProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.__init__" /> + <keyword name="HisteditProjectHelper.__hgHisteditAbort" id="HisteditProjectHelper.__hgHisteditAbort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.__hgHisteditAbort" /> + <keyword name="HisteditProjectHelper.__hgHisteditContinue" id="HisteditProjectHelper.__hgHisteditContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.__hgHisteditContinue" /> + <keyword name="HisteditProjectHelper.__hgHisteditEditPlan" id="HisteditProjectHelper.__hgHisteditEditPlan" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.__hgHisteditEditPlan" /> + <keyword name="HisteditProjectHelper.__hgHisteditStart" id="HisteditProjectHelper.__hgHisteditStart" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.__hgHisteditStart" /> + <keyword name="HisteditProjectHelper.initActions" id="HisteditProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.initActions" /> + <keyword name="HisteditProjectHelper.initMenu" id="HisteditProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.initMenu" /> + <keyword name="HisteditProjectHelper.menuTitle" id="HisteditProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html#HisteditProjectHelper.menuTitle" /> <keyword name="History (Package)" id="History (Package)" ref="index-eric6.Helpviewer.History.html" /> <keyword name="History (Package)" id="History (Package)" ref="index-eric6.WebBrowser.History.html" /> <keyword name="HistoryCompleter" id="HistoryCompleter" ref="eric6.Helpviewer.History.HistoryCompleter.html#HistoryCompleter" /> @@ -11040,6 +11108,7 @@ <keyword name="ProjectFormsBrowser.handlePreferencesChanged" id="ProjectFormsBrowser.handlePreferencesChanged" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.handlePreferencesChanged" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html" /> @@ -16115,6 +16184,7 @@ <keyword name="createGlobalPluginsDir" id="createGlobalPluginsDir" ref="eric6.install.html#createGlobalPluginsDir" /> <keyword name="createInstallConfig" id="createInstallConfig" ref="eric6.install.html#createInstallConfig" /> <keyword name="createMacAppBundle" id="createMacAppBundle" ref="eric6.install.html#createMacAppBundle" /> + <keyword name="createMainWidget" id="createMainWidget" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html#createMainWidget" /> <keyword name="createMainWidget" id="createMainWidget" ref="eric6.eric6_browser.html#createMainWidget" /> <keyword name="createMainWidget" id="createMainWidget" ref="eric6.eric6_compare.html#createMainWidget" /> <keyword name="createMainWidget" id="createMainWidget" ref="eric6.eric6_configure.html#createMainWidget" /> @@ -16382,6 +16452,7 @@ <keyword name="hashPassword" id="hashPassword" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPassword" /> <keyword name="hashPasswordTuple" id="hashPasswordTuple" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPasswordTuple" /> <keyword name="hg (Module)" id="hg (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html" /> + <keyword name="histedit (Module)" id="histedit (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html" /> <keyword name="html_encode" id="html_encode" ref="eric6.Utilities.__init__.html#html_encode" /> <keyword name="html_udecode" id="html_udecode" ref="eric6.Utilities.__init__.html#html_udecode" /> <keyword name="html_uencode" id="html_uencode" ref="eric6.Utilities.__init__.html#html_uencode" /> @@ -16446,6 +16517,7 @@ <keyword name="loadTranslatorForLocale" id="loadTranslatorForLocale" ref="eric6.Toolbox.Startup.html#loadTranslatorForLocale" /> <keyword name="loadTranslators" id="loadTranslators" ref="eric6.Toolbox.Startup.html#loadTranslators" /> <keyword name="load_sourceAsStr" id="load_sourceAsStr" ref="eric6.Globals.compatibility_fixes.html#load_sourceAsStr" /> + <keyword name="main" id="main" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html#main" /> <keyword name="main" id="main" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#main" /> <keyword name="main" id="main" ref="eric6.cleanupSource.html#main" /> <keyword name="main" id="main" ref="eric6.compileUiFiles.html#main" /> @@ -17193,6 +17265,12 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html</file> @@ -17825,6 +17903,7 @@ <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file> + <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html</file>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sat Oct 29 16:22:35 2016 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sat Oct 29 19:28:04 2016 +0200 @@ -262,7 +262,7 @@ Private slot to send the input to the subversion process. </p><a NAME="HgDialog.startProcess" ID="HgDialog.startProcess"></a> <h4>HgDialog.startProcess</h4> -<b>startProcess</b>(<i>args, workingDir=None, showArgs=True</i>) +<b>startProcess</b>(<i>args, workingDir=None, showArgs=True, environment={}</i>) <p> Public slot used to start the process. </p><dl> @@ -275,6 +275,10 @@ </dd><dt><i>showArgs=</i></dt> <dd> flag indicating to show the arguments (boolean) +</dd><dt><i>environment=</i></dt> +<dd> +dictionary of environment settings to add + or change for the git process (dict of string and string) </dd> </dl><dl> <dt>Returns:</dt>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,123 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor</h1> +<p> +Module implementing a dialog to edit the commit message of a revision. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgHisteditCommitEditor">HgHisteditCommitEditor</a></td> +<td>Class implementing a dialog to edit the commit message of a revision.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgHisteditCommitEditor" ID="HgHisteditCommitEditor"></a> +<h2>HgHisteditCommitEditor</h2> +<p> + Class implementing a dialog to edit the commit message of a revision. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgHisteditCommitEditor +<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="#HgHisteditCommitEditor.__init__">HgHisteditCommitEditor</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgHisteditCommitEditor.__readFile">__readFile</a></td> +<td>Private method to read the file containing the commit message and populate the dialog.</td> +</tr><tr> +<td><a href="#HgHisteditCommitEditor.on_buttonBox_accepted">on_buttonBox_accepted</a></td> +<td>Private slot called by the buttonBox accepted signal.</td> +</tr><tr> +<td><a href="#HgHisteditCommitEditor.on_buttonBox_rejected">on_buttonBox_rejected</a></td> +<td>Private slot called by the buttonBox rejected signal.</td> +</tr><tr> +<td><a href="#HgHisteditCommitEditor.on_recentComboBox_activated">on_recentComboBox_activated</a></td> +<td>Private slot to select a commit message from recent ones.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgHisteditCommitEditor.__init__" ID="HgHisteditCommitEditor.__init__"></a> +<h4>HgHisteditCommitEditor (Constructor)</h4> +<b>HgHisteditCommitEditor</b>(<i>fileName, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>fileName</i> (str)</dt> +<dd> +name of the file containing the commit message + to be edited +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HgHisteditCommitEditor.__readFile" ID="HgHisteditCommitEditor.__readFile"></a> +<h4>HgHisteditCommitEditor.__readFile</h4> +<b>__readFile</b>(<i></i>) +<p> + Private method to read the file containing the commit message and + populate the dialog. +</p><a NAME="HgHisteditCommitEditor.on_buttonBox_accepted" ID="HgHisteditCommitEditor.on_buttonBox_accepted"></a> +<h4>HgHisteditCommitEditor.on_buttonBox_accepted</h4> +<b>on_buttonBox_accepted</b>(<i></i>) +<p> + Private slot called by the buttonBox accepted signal. +</p><a NAME="HgHisteditCommitEditor.on_buttonBox_rejected" ID="HgHisteditCommitEditor.on_buttonBox_rejected"></a> +<h4>HgHisteditCommitEditor.on_buttonBox_rejected</h4> +<b>on_buttonBox_rejected</b>(<i></i>) +<p> + Private slot called by the buttonBox rejected signal. +</p><a NAME="HgHisteditCommitEditor.on_recentComboBox_activated" ID="HgHisteditCommitEditor.on_recentComboBox_activated"></a> +<h4>HgHisteditCommitEditor.on_recentComboBox_activated</h4> +<b>on_recentComboBox_activated</b>(<i>txt</i>) +<p> + Private slot to select a commit message from recent ones. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the selected entry (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,294 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog</h1> +<p> +Module implementing a dialog to enter the histedit parameters. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgHisteditConfigDialog">HgHisteditConfigDialog</a></td> +<td>Class implementing a dialog to enter the histedit parameters.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgHisteditConfigDialog" ID="HgHisteditConfigDialog"></a> +<h2>HgHisteditConfigDialog</h2> +<p> + Class implementing a dialog to enter the histedit parameters. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgHisteditConfigDialog +<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="#HgHisteditConfigDialog.__init__">HgHisteditConfigDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.__getRevision">__getRevision</a></td> +<td>Private method to generate the revision.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.getData">getData</a></td> +<td>Public method to retrieve the data for the strip action.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_branch1Button_toggled">on_branch1Button_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_defaultButton_toggled">on_defaultButton_toggled</a></td> +<td>Private slot to handle changes of the Default select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_numberSpinBox_valueChanged">on_numberSpinBox_valueChanged</a></td> +<td>Private slot to handle changes of the Number spin box.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_outgoingButton_toggled">on_outgoingButton_toggled</a></td> +<td>Private slot to handle changes of the Outgoing select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_revisionButton_toggled">on_revisionButton_toggled</a></td> +<td>Private slot to handle changes of the Revision select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgHisteditConfigDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgHisteditConfigDialog.__init__" ID="HgHisteditConfigDialog.__init__"></a> +<h4>HgHisteditConfigDialog (Constructor)</h4> +<b>HgHisteditConfigDialog</b>(<i>tagsList, branchesList, bookmarksList=None, rev="", parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i> (list of str)</dt> +<dd> +list of tags +</dd><dt><i>branchesList</i> (list of str)</dt> +<dd> +list of branches +</dd><dt><i>bookmarksList</i> (list of str)</dt> +<dd> +list of bookmarks +</dd><dt><i>rev=</i> (str)</dt> +<dd> +revision to strip from +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HgHisteditConfigDialog.__getRevision" ID="HgHisteditConfigDialog.__getRevision"></a> +<h4>HgHisteditConfigDialog.__getRevision</h4> +<b>__getRevision</b>(<i></i>) +<p> + Private method to generate the revision. +</p><dl> +<dt>Returns:</dt> +<dd> +revision +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HgHisteditConfigDialog.__updateOK" ID="HgHisteditConfigDialog.__updateOK"></a> +<h4>HgHisteditConfigDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgHisteditConfigDialog.getData" ID="HgHisteditConfigDialog.getData"></a> +<h4>HgHisteditConfigDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the data for the strip action. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with the revision, a flag indicating to to outgoing and a + flag indicating to keep old nodes +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple (str, bool, bool) +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_bookmarkButton_toggled" ID="HgHisteditConfigDialog.on_bookmarkButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged" ID="HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgHisteditConfigDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text of the combo +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_branch1Button_toggled" ID="HgHisteditConfigDialog.on_branch1Button_toggled"></a> +<h4>HgHisteditConfigDialog.on_branch1Button_toggled</h4> +<b>on_branch1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_branchCombo_editTextChanged" ID="HgHisteditConfigDialog.on_branchCombo_editTextChanged"></a> +<h4>HgHisteditConfigDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text of the combo +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_defaultButton_toggled" ID="HgHisteditConfigDialog.on_defaultButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_defaultButton_toggled</h4> +<b>on_defaultButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Default select button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the button +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_idButton_toggled" ID="HgHisteditConfigDialog.on_idButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_idEdit_textChanged" ID="HgHisteditConfigDialog.on_idEdit_textChanged"></a> +<h4>HgHisteditConfigDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text of the edit +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_numberSpinBox_valueChanged" ID="HgHisteditConfigDialog.on_numberSpinBox_valueChanged"></a> +<h4>HgHisteditConfigDialog.on_numberSpinBox_valueChanged</h4> +<b>on_numberSpinBox_valueChanged</b>(<i>val</i>) +<p> + Private slot to handle changes of the Number spin box. +</p><dl> +<dt><i>val</i> (int)</dt> +<dd> +value of the spin box +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_outgoingButton_toggled" ID="HgHisteditConfigDialog.on_outgoingButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_outgoingButton_toggled</h4> +<b>on_outgoingButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Outgoing select button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the button +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_revisionButton_toggled" ID="HgHisteditConfigDialog.on_revisionButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_revisionButton_toggled</h4> +<b>on_revisionButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Revision select button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the button +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_tagButton_toggled" ID="HgHisteditConfigDialog.on_tagButton_toggled"></a> +<h4>HgHisteditConfigDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgHisteditConfigDialog.on_tagCombo_editTextChanged" ID="HgHisteditConfigDialog.on_tagCombo_editTextChanged"></a> +<h4>HgHisteditConfigDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text of the combo +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,78 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor</h1> +<p> +Module implementing the main script for histedit. Depending on the file +name given by the Mercurial histedit command one of two possible dialogs +will be shown. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#createMainWidget">createMainWidget</a></td> +<td>Function to create the main widget.</td> +</tr><tr> +<td><a href="#main">main</a></td> +<td>Main entry point into the application.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="createMainWidget" ID="createMainWidget"></a> +<h2>createMainWidget</h2> +<b>createMainWidget</b>(<i>argv</i>) +<p> + Function to create the main widget. +</p><dl> +<dt><i>argv</i> (list of str)</dt> +<dd> +list of commandline parameters +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the main widget or None in case of an error +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QWidget or None +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="main" ID="main"></a> +<h2>main</h2> +<b>main</b>(<i></i>) +<p> + Main entry point into the application. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,271 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor</h1> +<p> +Module implementing a dialog to edit the history modification plan. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgHisteditPlanActionComboBox">HgHisteditPlanActionComboBox</a></td> +<td>Class implementing a combo box to select the action in the plan tree.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor">HgHisteditPlanEditor</a></td> +<td>Class implementing a dialog to edit the history modification plan.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgHisteditPlanActionComboBox" ID="HgHisteditPlanActionComboBox"></a> +<h2>HgHisteditPlanActionComboBox</h2> +<p> + Class implementing a combo box to select the action in the plan tree. +</p> +<h3>Derived from</h3> +QComboBox +<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="#HgHisteditPlanActionComboBox.__init__">HgHisteditPlanActionComboBox</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgHisteditPlanActionComboBox.__changeItem">__changeItem</a></td> +<td>Private slot to handle the selection of a plan action.</td> +</tr><tr> +<td><a href="#HgHisteditPlanActionComboBox.showPopup">showPopup</a></td> +<td>Public method to show the list of items of the combo box.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgHisteditPlanActionComboBox.__init__" ID="HgHisteditPlanActionComboBox.__init__"></a> +<h4>HgHisteditPlanActionComboBox (Constructor)</h4> +<b>HgHisteditPlanActionComboBox</b>(<i>item, column</i>) +<p> + Constructor +</p><dl> +<dt><i>item</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item +</dd><dt><i>column</i> (int)</dt> +<dd> +column number inside the tree widget item +</dd> +</dl><a NAME="HgHisteditPlanActionComboBox.__changeItem" ID="HgHisteditPlanActionComboBox.__changeItem"></a> +<h4>HgHisteditPlanActionComboBox.__changeItem</h4> +<b>__changeItem</b>(<i>index</i>) +<p> + Private slot to handle the selection of a plan action. +</p><p> + This method sets the text of the associated item for the specified + cell in order to be able to retrieve it with a call of the text() + method of the item. +</p><dl> +<dt><i>index</i> (int)</dt> +<dd> +index of the selected action +</dd> +</dl><a NAME="HgHisteditPlanActionComboBox.showPopup" ID="HgHisteditPlanActionComboBox.showPopup"></a> +<h4>HgHisteditPlanActionComboBox.showPopup</h4> +<b>showPopup</b>(<i></i>) +<p> + Public method to show the list of items of the combo box. +</p><p> + This is reimplemented in order to set the associated item as the + current item of the tree widget. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="HgHisteditPlanEditor" ID="HgHisteditPlanEditor"></a> +<h2>HgHisteditPlanEditor</h2> +<p> + Class implementing a dialog to edit the history modification plan. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgHisteditPlanEditor +<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="#HgHisteditPlanEditor.__init__">HgHisteditPlanEditor</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__addActionCombo">__addActionCombo</a></td> +<td>Private method to add an edit action combo to an item.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__assembleEditPlan">__assembleEditPlan</a></td> +<td>Private method to assemble the edit plan into text suitable for the histedit file.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__createPlanItem">__createPlanItem</a></td> +<td>Private method to create an edit plan tree item.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__readFile">__readFile</a></td> +<td>Private method to read the file containing the edit plan and populate the dialog.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__resizeSections">__resizeSections</a></td> +<td>Private method to resize the tree widget sections.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.__updateButtons">__updateButtons</a></td> +<td>Private method to set the enabled state of the up and down buttons.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.on_buttonBox_accepted">on_buttonBox_accepted</a></td> +<td>Private slot called by the buttonBox accepted signal.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.on_buttonBox_rejected">on_buttonBox_rejected</a></td> +<td>Private slot called by the buttonBox rejected signal.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current entry down one line.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged">on_planTreeWidget_currentItemChanged</a></td> +<td>Private slot handling the change of the current edit plan item.</td> +</tr><tr> +<td><a href="#HgHisteditPlanEditor.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current entry up one line.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgHisteditPlanEditor.__init__" ID="HgHisteditPlanEditor.__init__"></a> +<h4>HgHisteditPlanEditor (Constructor)</h4> +<b>HgHisteditPlanEditor</b>(<i>fileName, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>fileName</i> (str)</dt> +<dd> +name of the file containing the history edit plan + to be edited +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HgHisteditPlanEditor.__addActionCombo" ID="HgHisteditPlanEditor.__addActionCombo"></a> +<h4>HgHisteditPlanEditor.__addActionCombo</h4> +<b>__addActionCombo</b>(<i>item</i>) +<p> + Private method to add an edit action combo to an item. +</p><dl> +<dt><i>item</i> (QTreeWidgetItem)</dt> +<dd> +reference to the tree widget item +</dd> +</dl><a NAME="HgHisteditPlanEditor.__assembleEditPlan" ID="HgHisteditPlanEditor.__assembleEditPlan"></a> +<h4>HgHisteditPlanEditor.__assembleEditPlan</h4> +<b>__assembleEditPlan</b>(<i></i>) +<p> + Private method to assemble the edit plan into text suitable for the + histedit file. +</p><dl> +<dt>Returns:</dt> +<dd> +assembled edit plan text +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HgHisteditPlanEditor.__createPlanItem" ID="HgHisteditPlanEditor.__createPlanItem"></a> +<h4>HgHisteditPlanEditor.__createPlanItem</h4> +<b>__createPlanItem</b>(<i>text</i>) +<p> + Private method to create an edit plan tree item. +</p><a NAME="HgHisteditPlanEditor.__readFile" ID="HgHisteditPlanEditor.__readFile"></a> +<h4>HgHisteditPlanEditor.__readFile</h4> +<b>__readFile</b>(<i></i>) +<p> + Private method to read the file containing the edit plan and + populate the dialog. +</p><a NAME="HgHisteditPlanEditor.__resizeSections" ID="HgHisteditPlanEditor.__resizeSections"></a> +<h4>HgHisteditPlanEditor.__resizeSections</h4> +<b>__resizeSections</b>(<i></i>) +<p> + Private method to resize the tree widget sections. +</p><a NAME="HgHisteditPlanEditor.__updateButtons" ID="HgHisteditPlanEditor.__updateButtons"></a> +<h4>HgHisteditPlanEditor.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to set the enabled state of the up and down buttons. +</p><a NAME="HgHisteditPlanEditor.on_buttonBox_accepted" ID="HgHisteditPlanEditor.on_buttonBox_accepted"></a> +<h4>HgHisteditPlanEditor.on_buttonBox_accepted</h4> +<b>on_buttonBox_accepted</b>(<i></i>) +<p> + Private slot called by the buttonBox accepted signal. +</p><a NAME="HgHisteditPlanEditor.on_buttonBox_rejected" ID="HgHisteditPlanEditor.on_buttonBox_rejected"></a> +<h4>HgHisteditPlanEditor.on_buttonBox_rejected</h4> +<b>on_buttonBox_rejected</b>(<i></i>) +<p> + Private slot called by the buttonBox rejected signal. +</p><a NAME="HgHisteditPlanEditor.on_downButton_clicked" ID="HgHisteditPlanEditor.on_downButton_clicked"></a> +<h4>HgHisteditPlanEditor.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current entry down one line. +</p><a NAME="HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged" ID="HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged"></a> +<h4>HgHisteditPlanEditor.on_planTreeWidget_currentItemChanged</h4> +<b>on_planTreeWidget_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot handling the change of the current edit plan item. +</p><dl> +<dt><i>current</i> (QTreeWidgetItem)</dt> +<dd> +reference to the current edit plan item +</dd><dt><i>previous</i> (QTreeWidgetItem)</dt> +<dd> +reference to the previous current edit plan item +</dd> +</dl><a NAME="HgHisteditPlanEditor.on_upButton_clicked" ID="HgHisteditPlanEditor.on_upButton_clicked"></a> +<h4>HgHisteditPlanEditor.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current entry up one line. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,153 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper</h1> +<p> +Module implementing the histedit extension project helper. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HisteditProjectHelper">HisteditProjectHelper</a></td> +<td>Class implementing the histedit extension project helper.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HisteditProjectHelper" ID="HisteditProjectHelper"></a> +<h2>HisteditProjectHelper</h2> +<p> + Class implementing the histedit extension project helper. +</p> +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HisteditProjectHelper.__init__">HisteditProjectHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.__hgHisteditAbort">__hgHisteditAbort</a></td> +<td>Private slot used to abort an interrupted history editing session.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.__hgHisteditContinue">__hgHisteditContinue</a></td> +<td>Private slot used to continue an interrupted history editing session.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.__hgHisteditEditPlan">__hgHisteditEditPlan</a></td> +<td>Private slot used to edit the remaining actions list of an interrupted history editing session.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.__hgHisteditStart">__hgHisteditStart</a></td> +<td>Private slot used to start a history editing session.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr><tr> +<td><a href="#HisteditProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HisteditProjectHelper.__init__" ID="HisteditProjectHelper.__init__"></a> +<h4>HisteditProjectHelper (Constructor)</h4> +<b>HisteditProjectHelper</b>(<i></i>) +<p> + Constructor +</p><a NAME="HisteditProjectHelper.__hgHisteditAbort" ID="HisteditProjectHelper.__hgHisteditAbort"></a> +<h4>HisteditProjectHelper.__hgHisteditAbort</h4> +<b>__hgHisteditAbort</b>(<i></i>) +<p> + Private slot used to abort an interrupted history editing session. +</p><a NAME="HisteditProjectHelper.__hgHisteditContinue" ID="HisteditProjectHelper.__hgHisteditContinue"></a> +<h4>HisteditProjectHelper.__hgHisteditContinue</h4> +<b>__hgHisteditContinue</b>(<i></i>) +<p> + Private slot used to continue an interrupted history editing session. +</p><a NAME="HisteditProjectHelper.__hgHisteditEditPlan" ID="HisteditProjectHelper.__hgHisteditEditPlan"></a> +<h4>HisteditProjectHelper.__hgHisteditEditPlan</h4> +<b>__hgHisteditEditPlan</b>(<i></i>) +<p> + Private slot used to edit the remaining actions list of an interrupted + history editing session. +</p><a NAME="HisteditProjectHelper.__hgHisteditStart" ID="HisteditProjectHelper.__hgHisteditStart"></a> +<h4>HisteditProjectHelper.__hgHisteditStart</h4> +<b>__hgHisteditStart</b>(<i></i>) +<p> + Private slot used to start a history editing session. +</p><a NAME="HisteditProjectHelper.initActions" ID="HisteditProjectHelper.initActions"></a> +<h4>HisteditProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p><a NAME="HisteditProjectHelper.initMenu" ID="HisteditProjectHelper.initMenu"></a> +<h4>HisteditProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p><dl> +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +populated menu (QMenu) +</dd> +</dl><a NAME="HisteditProjectHelper.menuTitle" ID="HisteditProjectHelper.menuTitle"></a> +<h4>HisteditProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p><dl> +<dt>Returns:</dt> +<dd> +title of the menu +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,177 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit</h1> +<p> +Module implementing the histedit extension interface. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Histedit">Histedit</a></td> +<td>Class implementing the histedit extension interface.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="Histedit" ID="Histedit"></a> +<h2>Histedit</h2> +<p> + Class implementing the histedit extension interface. +</p> +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Histedit.__init__">Histedit</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Histedit.hgHisteditAbort">hgHisteditAbort</a></td> +<td>Public method to abort an interrupted histedit session.</td> +</tr><tr> +<td><a href="#Histedit.hgHisteditContinue">hgHisteditContinue</a></td> +<td>Public method to continue an interrupted histedit session.</td> +</tr><tr> +<td><a href="#Histedit.hgHisteditEditPlan">hgHisteditEditPlan</a></td> +<td>Public method to edit the remaining actions list of an interrupted histedit session.</td> +</tr><tr> +<td><a href="#Histedit.hgHisteditStart">hgHisteditStart</a></td> +<td>Public method to start a histedit session.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="Histedit.__init__" ID="Histedit.__init__"></a> +<h4>Histedit (Constructor)</h4> +<b>Histedit</b>(<i>vcs</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +</dl><a NAME="Histedit.hgHisteditAbort" ID="Histedit.hgHisteditAbort"></a> +<h4>Histedit.hgHisteditAbort</h4> +<b>hgHisteditAbort</b>(<i>name</i>) +<p> + Public method to abort an interrupted histedit session. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="Histedit.hgHisteditContinue" ID="Histedit.hgHisteditContinue"></a> +<h4>Histedit.hgHisteditContinue</h4> +<b>hgHisteditContinue</b>(<i>name</i>) +<p> + Public method to continue an interrupted histedit session. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="Histedit.hgHisteditEditPlan" ID="Histedit.hgHisteditEditPlan"></a> +<h4>Histedit.hgHisteditEditPlan</h4> +<b>hgHisteditEditPlan</b>(<i>name</i>) +<p> + Public method to edit the remaining actions list of an interrupted + histedit session. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="Histedit.hgHisteditStart" ID="Histedit.hgHisteditStart"></a> +<h4>Histedit.hgHisteditStart</h4> +<b>hgHisteditStart</b>(<i>name, rev=""</i>) +<p> + Public method to start a histedit session. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name +</dd><dt><i>rev=</i> (str)</dt> +<dd> +revision to start histedit at +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,50 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension</h1> +<p> +Package implementing the histedit extension support interface. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html">HgHisteditCommitEditor</a></td> +<td>Module implementing a dialog to edit the commit message of a revision.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html">HgHisteditConfigDialog</a></td> +<td>Module implementing a dialog to enter the histedit parameters.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html">HgHisteditEditor</a></td> +<td>Module implementing the main script for histedit.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditPlanEditor.html">HgHisteditPlanEditor</a></td> +<td>Module implementing a dialog to edit the history modification plan.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the histedit extension project helper.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html">histedit</a></td> +<td>Module implementing the histedit extension interface.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sat Oct 29 16:22:35 2016 +0200 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sat Oct 29 19:28:04 2016 +0200 @@ -39,6 +39,9 @@ <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html">GpgExtension</a></td> <td>Package implementing the gpg extension support interface.</td> </tr><tr> +<td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html">HisteditExtension</a></td> +<td>Package implementing the histedit extension support interface.</td> +</tr><tr> <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html">LargefilesExtension</a></td> <td>Package implementing the largefiles extension support interface.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Oct 29 16:22:35 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Oct 29 19:28:04 2016 +0200 @@ -15,7 +15,8 @@ import os -from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication +from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \ + QProcessEnvironment from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit from E5Gui import E5MessageBox @@ -116,13 +117,16 @@ self.normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0) self.__finish() - def startProcess(self, args, workingDir=None, showArgs=True): + def startProcess(self, args, workingDir=None, showArgs=True, + environment={}): """ Public slot used to start the process. @param args list of arguments for the process (list of strings) @keyparam workingDir working directory for the process (string) @keyparam showArgs flag indicating to show the arguments (boolean) + @keyparam environment dictionary of environment settings to add + or change for the git process (dict of string and string) @return flag indicating a successful start of the process """ self.errorGroup.hide() @@ -132,7 +136,7 @@ self.__hasAddOrDelete = False if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "update", "import", "revert", "graft", "shelve", - "unshelve", "strip"] or \ + "unshelve", "strip", "histedit"] or \ (args[0] in ["pull", "unbundle"] and ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True @@ -145,6 +149,11 @@ if self.__hgClient is None: self.proc = QProcess() + if environment: + env = QProcessEnvironment.systemEnvironment() + for key, value in environment.items(): + env.insert(key, value) + self.proc.setProcessEnvironment(env) self.proc.finished.connect(self.__procFinished) self.proc.readyReadStandardOutput.connect(self.__readStdout)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to edit the commit message of a revision. +""" + +from PyQt5.QtCore import pyqtSlot, QCoreApplication +from PyQt5.QtWidgets import QDialog + +from E5Gui import E5MessageBox + +from Ui_HgHisteditCommitEditor import Ui_HgHisteditCommitEditor + +import Preferences + + +class HgHisteditCommitEditor(QDialog, Ui_HgHisteditCommitEditor): + """ + Class implementing a dialog to edit the commit message of a revision. + """ + def __init__(self, fileName, parent=None): + """ + Constructor + + @param fileName name of the file containing the commit message + to be edited + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(HgHisteditCommitEditor, self).__init__(parent) + self.setupUi(self) + + self.__fileName = fileName + self.__readFile() + + self.recentCommitMessages = Preferences.toList( + Preferences.Prefs.settings.value('Mercurial/Commits')) + self.recentComboBox.clear() + self.recentComboBox.addItem("") + self.recentComboBox.addItems(self.recentCommitMessages) + + def __readFile(self): + """ + Private method to read the file containing the commit message and + populate the dialog. + """ + try: + f = open(self.__fileName, "r") + txt = f.read() + f.close() + except (IOError, OSError) as err: + E5MessageBox.critical( + self, + self.tr("Edit Commit Message"), + self.tr("""<p>The file <b>{0}</b> could not be read.</p>""" + """<p>Reason: {1}</p>""").format( + self.__fileName, str(err))) + self.on_buttonBox_rejected() + return + + msgLines = [] + infoLines = [] + for line in txt.splitlines(): + if line.startswith("#"): + infoLines.append(line[1:].lstrip()) + elif line.startswith("HG:"): + infoLines.append(line[3:].lstrip()) + else: + msgLines.append(line) + + # remove empty lines at end of message + for row in range(len(msgLines) - 1, -1, -1): + if msgLines[row] == "": + del msgLines[row] + else: + break + + self.messageEdit.setPlainText("\n".join(msgLines)) + self.infoEdit.setPlainText("\n".join(infoLines)) + + @pyqtSlot() + def on_buttonBox_accepted(self): + """ + Private slot called by the buttonBox accepted signal. + """ + msg = self.messageEdit.toPlainText() + try: + f = open(self.__fileName, "w") + f.write(msg) + f.close() + except (IOError, OSError) as err: + E5MessageBox.critical( + self, + self.tr("Edit Commit Message"), + self.tr("""<p>The file <b>{0}</b> could not be read.</p>""" + """<p>Reason: {1}</p>""").format( + self.__fileName, str(err))) + self.on_buttonBox_rejected() + return + + self.close() + QCoreApplication.exit(0) + + @pyqtSlot() + def on_buttonBox_rejected(self): + """ + Private slot called by the buttonBox rejected signal. + """ + self.close() + QCoreApplication.exit(1) + + @pyqtSlot(str) + def on_recentComboBox_activated(self, txt): + """ + Private slot to select a commit message from recent ones. + + @param txt text of the selected entry (string) + """ + if txt: + self.messageEdit.setPlainText(txt)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgHisteditCommitEditor</class> + <widget class="QDialog" name="HgHisteditCommitEditor"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>600</height> + </rect> + </property> + <property name="windowTitle"> + <string>Commit Message</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Commit Message</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QPlainTextEdit" name="messageEdit"> + <property name="toolTip"> + <string>Edit the commit message</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Recent commit messages</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="recentComboBox"> + <property name="toolTip"> + <string>Select a recent commit message to use</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Information</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPlainTextEdit" name="infoEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,231 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the histedit parameters. +""" + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup + +from .Ui_HgHisteditConfigDialog import Ui_HgHisteditConfigDialog + + +# TODO: Fix select button handling +class HgHisteditConfigDialog(QDialog, Ui_HgHisteditConfigDialog): + """ + Class implementing a dialog to enter the histedit parameters. + """ + def __init__(self, tagsList, branchesList, bookmarksList=None, rev="", + parent=None): + """ + Constructor + + @param tagsList list of tags + @type list of str + @param branchesList list of branches + @type list of str + @param bookmarksList list of bookmarks + @type list of str + @keyparam rev revision to strip from + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(HgHisteditConfigDialog, self).__init__(parent) + self.setupUi(self) + + self.__sourceRevisionButtonGroup = QButtonGroup(self) + self.__sourceRevisionButtonGroup.addButton(self.defaultButton) + self.__sourceRevisionButtonGroup.addButton(self.outgoingButton) + self.__sourceRevisionButtonGroup.addButton(self.revisionButton) + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) + if bookmarksList is not None: + self.bookmarkCombo.addItems(sorted(bookmarksList)) + + self.idEdit.setText(rev) + if rev: + self.revisionButton.setChecked(True) + else: + self.defaultButton.setChecked(True) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + self.__updateOK() + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + + if self.revisionButton.isChecked(): + if self.idButton.isChecked(): + enabled = enabled and bool(self.idEdit.text()) + elif self.tagButton.isChecked(): + enabled = enabled and bool(self.tagCombo.currentText()) + elif self.branchButton.isChecked(): + enabled = enabled and bool(self.branchCombo.currentText()) + elif self.bookmarkButton.isChecked(): + enabled = enabled and bool(self.bookmarkCombo.currentText()) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_defaultButton_toggled(self, checked): + """ + Private slot to handle changes of the Default select button. + + @param checked state of the button + @type bool + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_outgoingButton_toggled(self, checked): + """ + Private slot to handle changes of the Outgoing select button. + + @param checked state of the button + @type bool + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_revisionButton_toggled(self, checked): + """ + Private slot to handle changes of the Revision select button. + + @param checked state of the button + @type bool + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_idButton_toggled(self, checked): + """ + Private slot to handle changes of the ID select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branch1Button_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_bookmarkButton_toggled(self, checked): + """ + Private slot to handle changes of the Bookmark select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(int) + def on_numberSpinBox_valueChanged(self, val): + """ + Private slot to handle changes of the Number spin box. + + @param val value of the spin box + @type int + """ + self.__updateOK() + + @pyqtSlot(str) + def on_idEdit_textChanged(self, txt): + """ + Private slot to handle changes of the ID edit. + + @param txt text of the edit + @type str + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo + @type str + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo + @type str + """ + self.__updateOK() + + @pyqtSlot(str) + def on_bookmarkCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Bookmark combo. + + @param txt text of the combo + @type str + """ + self.__updateOK() + + def __getRevision(self): + """ + Private method to generate the revision. + + @return revision + @rtype str + """ + if self.defaultButton.isChecked(): + return "" + elif self.outgoingButton.isChecked(): + return "--outgoing" + else: + # self.revisionButton.isChecked() + if self.numberButton.isChecked(): + return "rev({0})".format(self.numberSpinBox.value()) + elif self.idButton.isChecked(): + return "id({0})".format(self.idEdit.text()) + elif self.tagButton.isChecked(): + return self.tagCombo.currentText() + elif self.branchButton.isChecked(): + return self.branchCombo.currentText() + elif self.bookmarkButton.isChecked(): + return self.bookmarkCombo.currentText() + + def getData(self): + """ + Public method to retrieve the data for the strip action. + + @return tuple with the revision, a flag indicating to to outgoing and a + flag indicating to keep old nodes + @rtype tuple (str, bool, bool) + """ + return ( + self.__getRevision(), + self.forceCheckBox.isChecked(), + self.keepCheckBox.isChecked(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,416 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgHisteditConfigDialog</class> + <widget class="QDialog" name="HgHisteditConfigDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>451</height> + </rect> + </property> + <property name="windowTitle"> + <string>Histedit Configuration</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Start Revision</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="defaultButton"> + <property name="toolTip"> + <string>Select to use the default revision as the base</string> + </property> + <property name="text"> + <string>Default Revision</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="outgoingButton"> + <property name="toolTip"> + <string>Select to edit all outgoing revisions</string> + </property> + <property name="text"> + <string>All Outgoing</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="revisionButton"> + <property name="toolTip"> + <string>Select to use a revision as start point</string> + </property> + <property name="text"> + <string>Revision</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="revisionGroupBox"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="numberButton"> + <property name="toolTip"> + <string>Select to specify a revision by number</string> + </property> + <property name="text"> + <string>Number</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="numberSpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a revision number</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="idButton"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Id:</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="idEdit"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="toolTip"> + <string>Enter a changeset id</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QRadioButton" name="bookmarkButton"> + <property name="toolTip"> + <string>Select to specify a revision by a bookmark</string> + </property> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QComboBox" name="bookmarkCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a bookmark name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Select to force outgoing</string> + </property> + <property name="text"> + <string>Force outgoing</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="toolTip"> + <string>Select to keep old nodes</string> + </property> + <property name="text"> + <string>Keep old nodes</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>defaultButton</tabstop> + <tabstop>outgoingButton</tabstop> + <tabstop>revisionButton</tabstop> + <tabstop>numberButton</tabstop> + <tabstop>numberSpinBox</tabstop> + <tabstop>idButton</tabstop> + <tabstop>idEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>bookmarkButton</tabstop> + <tabstop>bookmarkCombo</tabstop> + <tabstop>forceCheckBox</tabstop> + <tabstop>keepCheckBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgHisteditConfigDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>228</x> + <y>429</y> + </hint> + <hint type="destinationlabel"> + <x>150</x> + <y>450</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgHisteditConfigDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>296</x> + <y>435</y> + </hint> + <hint type="destinationlabel"> + <x>337</x> + <y>450</y> + </hint> + </hints> + </connection> + <connection> + <sender>revisionButton</sender> + <signal>toggled(bool)</signal> + <receiver>revisionGroupBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>67</x> + <y>117</y> + </hint> + <hint type="destinationlabel"> + <x>64</x> + <y>145</y> + </hint> + </hints> + </connection> + <connection> + <sender>numberButton</sender> + <signal>toggled(bool)</signal> + <receiver>numberSpinBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>104</x> + <y>183</y> + </hint> + <hint type="destinationlabel"> + <x>158</x> + <y>180</y> + </hint> + </hints> + </connection> + <connection> + <sender>idButton</sender> + <signal>toggled(bool)</signal> + <receiver>idEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>103</x> + <y>214</y> + </hint> + <hint type="destinationlabel"> + <x>161</x> + <y>216</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>91</x> + <y>247</y> + </hint> + <hint type="destinationlabel"> + <x>172</x> + <y>243</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>105</x> + <y>281</y> + </hint> + <hint type="destinationlabel"> + <x>165</x> + <y>279</y> + </hint> + </hints> + </connection> + <connection> + <sender>bookmarkButton</sender> + <signal>toggled(bool)</signal> + <receiver>bookmarkCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>104</x> + <y>308</y> + </hint> + <hint type="destinationlabel"> + <x>156</x> + <y>308</y> + </hint> + </hints> + </connection> + <connection> + <sender>outgoingButton</sender> + <signal>toggled(bool)</signal> + <receiver>forceCheckBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>94</x> + <y>88</y> + </hint> + <hint type="destinationlabel"> + <x>117</x> + <y>374</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,92 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the main script for histedit. Depending on the file +name given by the Mercurial histedit command one of two possible dialogs +will be shown. +""" + +from __future__ import unicode_literals + +import sys +import os + +sys.path.insert(1, os.path.join( + os.path.dirname(__file__), "..", "..", "..", "..")) +# four times up is the eric6 package directory + +import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ + +try: # Only for Py2 + import Globals.compatibility_fixes # __IGNORE_WARNING__ +except (ImportError): + pass + +for arg in sys.argv[:]: + if arg.startswith("--config="): + import Globals + configDir = arg.replace("--config=", "") + Globals.setConfigDir(configDir) + sys.argv.remove(arg) + elif arg.startswith("--settings="): + from PyQt5.QtCore import QSettings + settingsDir = os.path.expanduser(arg.replace("--settings=", "")) + if not os.path.isdir(settingsDir): + os.makedirs(settingsDir) + QSettings.setPath(QSettings.IniFormat, QSettings.UserScope, + settingsDir) + sys.argv.remove(arg) + +from Globals import AppInfo + +from Toolbox import Startup + + +def createMainWidget(argv): + """ + Function to create the main widget. + + @param argv list of commandline parameters + @type list of str + @return reference to the main widget or None in case of an error + @rtype QWidget or None + """ + if len(argv) > 1: + fileName = os.path.basename(argv[1]) + if fileName.startswith("hg-histedit-"): + from HgHisteditPlanEditor import HgHisteditPlanEditor + return HgHisteditPlanEditor(argv[1]) + elif fileName.startswith("hg-editor-"): + from HgHisteditCommitEditor import HgHisteditCommitEditor + return HgHisteditCommitEditor(argv[1]) + + return None + + +def main(): + """ + Main entry point into the application. + """ + options = [ + ("--config=configDir", + "use the given directory as the one containing the config files"), + ("--settings=settingsDir", + "use the given directory to store the settings files"), + ("", "name of file to edit") + ] + appinfo = AppInfo.makeAppInfo(sys.argv, + "Mercurial Histedit Editor", + "", + "Editor for the Mercurial histedit command", + options) + res = Startup.simpleAppStartup(sys.argv, + appinfo, + createMainWidget) + sys.exit(res) + +if __name__ == '__main__': + main()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,283 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to edit the history modification plan. +""" + +from PyQt5.QtCore import pyqtSlot, QCoreApplication +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QComboBox + +from E5Gui import E5MessageBox + +from Ui_HgHisteditPlanEditor import Ui_HgHisteditPlanEditor + +import UI.PixmapCache + + +class HgHisteditPlanActionComboBox(QComboBox): + """ + Class implementing a combo box to select the action in the plan tree. + """ + def __init__(self, item, column): + """ + Constructor + + @param item reference to the item + @type QTreeWidgetItem + @param column column number inside the tree widget item + @type int + """ + super(HgHisteditPlanActionComboBox, self).__init__() + + self.__item = item + self.__column = column + + self.addItems(["pick", "drop", "mess", "fold", "roll", "edit"]) + txt = self.__item.text(self.__column) + index = self.findText(txt) + if index > -1: + self.setCurrentIndex(index) + + self.currentIndexChanged.connect(self.__changeItem) + + @pyqtSlot(int) + def __changeItem(self, index): + """ + Private slot to handle the selection of a plan action. + + This method sets the text of the associated item for the specified + cell in order to be able to retrieve it with a call of the text() + method of the item. + + @param index index of the selected action + @type int + """ + self.__item.setText(self.__column, self.currentText()) + self.__item.treeWidget().setCurrentItem(self.__item) + + def showPopup(self): + """ + Public method to show the list of items of the combo box. + + This is reimplemented in order to set the associated item as the + current item of the tree widget. + """ + self.__item.treeWidget().setCurrentItem(self.__item) + super(HgHisteditPlanActionComboBox, self).showPopup() + + +class HgHisteditPlanEditor(QDialog, Ui_HgHisteditPlanEditor): + """ + Class implementing a dialog to edit the history modification plan. + """ + def __init__(self, fileName, parent=None): + """ + Constructor + + @param fileName name of the file containing the history edit plan + to be edited + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(HgHisteditPlanEditor, self).__init__(parent) + self.setupUi(self) + + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + + self.planTreeWidget.headerItem().setText( + self.planTreeWidget.columnCount(), "") + + self.__fileName = fileName + self.__readFile() + + self.__updateButtons() + + def __readFile(self): + """ + Private method to read the file containing the edit plan and + populate the dialog. + """ + try: + f = open(self.__fileName, "r") + txt = f.read() + f.close() + except (IOError, OSError) as err: + E5MessageBox.critical( + self, + self.tr("Edit Plan"), + self.tr("""<p>The file <b>{0}</b> could not be read.</p>""" + """<p>Reason: {1}</p>""").format( + self.__fileName, str(err))) + self.on_buttonBox_rejected() + return + + infoLines = [] + for line in txt.splitlines(): + if line.startswith("#"): + infoLines.append(line[1:].lstrip()) + else: + self.__createPlanItem(line) + self.infoEdit.setPlainText("\n".join(infoLines)) + + self.__resizeSections() + + def __addActionCombo(self, item): + """ + Private method to add an edit action combo to an item. + + @param item reference to the tree widget item + @type QTreeWidgetItem + """ + actionCombo = HgHisteditPlanActionComboBox(item, 0) + self.planTreeWidget.setItemWidget(item, 0, actionCombo) + item.setSizeHint(0, actionCombo.sizeHint()) + + def __createPlanItem(self, text): + """ + Private method to create an edit plan tree item. + """ + if not text.lstrip(): + return + + parts = text.split(" ", 3) + action = parts[0] + try: + rev = int(parts[2]) + if len(parts) > 3: + summary = parts[3] + else: + summary = "" + except ValueError: + rev = -1 + summary = " ".join(parts[2:]) + if rev > -1: + revision = "{0:>7}:{1}".format(rev, parts[1]) + else: + revision = parts[1] + + itm = QTreeWidgetItem(self.planTreeWidget, [ + action, + revision, + summary, + ]) + self.__addActionCombo(itm) + + def __resizeSections(self): + """ + Private method to resize the tree widget sections. + """ + for column in range(self.planTreeWidget.columnCount()): + self.planTreeWidget.resizeColumnToContents(column) + self.planTreeWidget.header().setStretchLastSection(True) + + def __updateButtons(self): + """ + Private method to set the enabled state of the up and down buttons. + """ + if self.planTreeWidget.currentItem() is None: + self.upButton.setEnabled(False) + self.downButton.setEnabled(False) + else: + row = self.planTreeWidget.indexOfTopLevelItem( + self.planTreeWidget.currentItem()) + self.upButton.setEnabled(row > 0) + self.downButton.setEnabled( + row < self.planTreeWidget.topLevelItemCount() - 1) + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_planTreeWidget_currentItemChanged(self, current, previous): + """ + Private slot handling the change of the current edit plan item. + + @param current reference to the current edit plan item + @type QTreeWidgetItem + @param previous reference to the previous current edit plan item + @type QTreeWidgetItem + """ + self.__updateButtons() + + @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current entry up one line. + """ + row = self.planTreeWidget.indexOfTopLevelItem( + self.planTreeWidget.currentItem()) + if row > 0: + targetRow = row - 1 + itm = self.planTreeWidget.takeTopLevelItem(row) + self.planTreeWidget.insertTopLevelItem(targetRow, itm) + self.__addActionCombo(itm) + self.planTreeWidget.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current entry down one line. + """ + row = self.planTreeWidget.indexOfTopLevelItem( + self.planTreeWidget.currentItem()) + if row < self.planTreeWidget.topLevelItemCount() - 1: + targetRow = row + 1 + itm = self.planTreeWidget.takeTopLevelItem(row) + self.planTreeWidget.insertTopLevelItem(targetRow, itm) + self.__addActionCombo(itm) + self.planTreeWidget.setCurrentItem(itm) + + @pyqtSlot() + def on_buttonBox_accepted(self): + """ + Private slot called by the buttonBox accepted signal. + """ + text = self.__assembleEditPlan() + try: + f = open(self.__fileName, "w") + f.write(text) + f.close() + except (IOError, OSError) as err: + E5MessageBox.critical( + self, + self.tr("Edit Plan"), + self.tr("""<p>The file <b>{0}</b> could not be read.</p>""" + """<p>Reason: {1}</p>""").format( + self.__fileName, str(err))) + self.on_buttonBox_rejected() + return + + self.close() + QCoreApplication.exit(0) + + @pyqtSlot() + def on_buttonBox_rejected(self): + """ + Private slot called by the buttonBox rejected signal. + """ + self.close() + QCoreApplication.exit(1) + + def __assembleEditPlan(self): + """ + Private method to assemble the edit plan into text suitable for the + histedit file. + + @return assembled edit plan text + @rtype str + """ + lines = [] + for row in range(self.planTreeWidget.topLevelItemCount()): + itm = self.planTreeWidget.topLevelItem(row) + if ":" in itm.text(1): + rev, changeset = itm.text(1).split(":", 1) + rev = "{0} {1}".format(changeset.strip(), rev.strip()) + else: + rev = itm.text(1).strip() + + lines.append("{0} {1} {2}".format(itm.text(0).strip(), rev, + itm.text(2))) + + return "\n".join(lines)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgHisteditPlanEditor</class> + <widget class="QDialog" name="HgHisteditPlanEditor"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>650</height> + </rect> + </property> + <property name="windowTitle"> + <string>Edit Plan</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Modification Plan</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QTreeWidget" name="planTreeWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <attribute name="headerStretchLastSection"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string>Action</string> + </property> + </column> + <column> + <property name="text"> + <string>Revision</string> + </property> + </column> + <column> + <property name="text"> + <string>Summary</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="upButton"> + <property name="toolTip"> + <string>Press to move the selected entry up</string> + </property> + <property name="text"> + <string>Up</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="downButton"> + <property name="toolTip"> + <string>Press to move the selected entry down</string> + </property> + <property name="text"> + <string>Down</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Information</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPlainTextEdit" name="infoEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>planTreeWidget</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> + <tabstop>infoEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgHisteditPlanEditor</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgHisteditPlanEditor</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,184 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the histedit extension project helper. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QMenu + +from E5Gui.E5Action import E5Action +from E5Gui import E5MessageBox + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + +import UI.PixmapCache + + +class HisteditProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the histedit extension project helper. + """ + def __init__(self): + """ + Constructor + """ + super(HisteditProjectHelper, self).__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgHisteditStartAct = E5Action( + self.tr('Start'), + UI.PixmapCache.getIcon("vcsEditHistory.png"), + self.tr('Start'), + 0, 0, self, 'mercurial_histedit_start') + self.hgHisteditStartAct.setStatusTip(self.tr( + 'Start a new changeset history editing session' + )) + self.hgHisteditStartAct.setWhatsThis(self.tr( + """<b>Start</b>""" + """<p>This starts a new history editing session. A dialog""" + """ will be presented to modify the edit plan.</p>""" + )) + self.hgHisteditStartAct.triggered.connect(self.__hgHisteditStart) + self.actions.append(self.hgHisteditStartAct) + + self.hgHisteditContinueAct = E5Action( + self.tr('Continue'), + self.tr('Continue'), + 0, 0, self, 'mercurial_histedit_continue') + self.hgHisteditContinueAct.setStatusTip(self.tr( + 'Continue an interrupted changeset history editing session' + )) + self.hgHisteditContinueAct.setWhatsThis(self.tr( + """<b>Continue</b>""" + """<p>This continues an interrupted history editing session.</p>""" + )) + self.hgHisteditContinueAct.triggered.connect(self.__hgHisteditContinue) + self.actions.append(self.hgHisteditContinueAct) + + self.hgHisteditAbortAct = E5Action( + self.tr('Abort'), + self.tr('Abort'), + 0, 0, self, 'mercurial_histedit_abort') + self.hgHisteditAbortAct.setStatusTip(self.tr( + 'Abort an interrupted changeset history editing session' + )) + self.hgHisteditAbortAct.setWhatsThis(self.tr( + """<b>Abort</b>""" + """<p>This aborts an interrupted history editing session.</p>""" + )) + self.hgHisteditAbortAct.triggered.connect(self.__hgHisteditAbort) + self.actions.append(self.hgHisteditAbortAct) + + self.hgHisteditEditPlanAct = E5Action( + self.tr('Edit Plan'), + self.tr('Edit Plan'), + 0, 0, self, 'mercurial_histedit_edit_plan') + self.hgHisteditEditPlanAct.setStatusTip(self.tr( + 'Edit the remaining actions list' + )) + self.hgHisteditEditPlanAct.setWhatsThis(self.tr( + """<b>Edit Plan</b>""" + """<p>This opens an editor to edit the remaining actions list""" + """ of an interrupted history editing session.</p>""" + )) + self.hgHisteditEditPlanAct.triggered.connect(self.__hgHisteditEditPlan) + self.actions.append(self.hgHisteditEditPlanAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu (QMenu) + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setIcon(UI.PixmapCache.getIcon("vcsEditHistory.png")) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgHisteditStartAct) + menu.addSeparator() + menu.addAction(self.hgHisteditContinueAct) + menu.addAction(self.hgHisteditAbortAct) + menu.addSeparator() + menu.addAction(self.hgHisteditEditPlanAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Edit History") + + def __hgHisteditStart(self): + """ + Private slot used to start a history editing session. + """ + shouldReopen = self.vcs.getExtensionObject("histedit")\ + .hgHisteditStart(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Start History Editing"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgHisteditContinue(self): + """ + Private slot used to continue an interrupted history editing session. + """ + shouldReopen = self.vcs.getExtensionObject("histedit")\ + .hgHisteditContinue(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Continue History Editing"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgHisteditAbort(self): + """ + Private slot used to abort an interrupted history editing session. + """ + shouldReopen = self.vcs.getExtensionObject("histedit")\ + .hgHisteditAbort(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Abort History Editing"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgHisteditEditPlan(self): + """ + Private slot used to edit the remaining actions list of an interrupted + history editing session. + """ + shouldReopen = self.vcs.getExtensionObject("histedit")\ + .hgHisteditEditPlan(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Edit Plan"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/__init__.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the histedit extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Sat Oct 29 19:28:04 2016 +0200 @@ -0,0 +1,192 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the histedit extension interface. +""" + +from __future__ import unicode_literals + +import os +import sys + +from PyQt5.QtWidgets import QDialog + +from ..HgExtension import HgExtension +from ..HgDialog import HgDialog + + +class Histedit(HgExtension): + """ + Class implementing the histedit extension interface. + """ + def __init__(self, vcs): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + """ + super(Histedit, self).__init__(vcs) + + def hgHisteditStart(self, name, rev=""): + """ + Public method to start a histedit session. + + @param name file/directory name + @type str + @keyparam rev revision to start histedit at + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + # find the root of the repo + repodir = self.vcs.splitPath(name)[0] + 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 + + from .HgHisteditConfigDialog import HgHisteditConfigDialog + res = False + dlg = HgHisteditConfigDialog(self.vcs.hgGetTagsList(repodir), + self.vcs.hgGetBranchesList(repodir), + self.vcs.hgGetBookmarksList(repodir), + rev) + if dlg.exec_() == QDialog.Accepted: + rev, force, keep = dlg.getData() + + args = self.vcs.initCommand("histedit") + args.append("-v") + if keep: + args.append("--keep") + if rev: + if rev == "--outgoing": + if force: + args.append("--force") + else: + args.append("--rev") + args.append(rev) + + editor = os.path.join( + os.path.dirname(__file__), "HgHisteditEditor.py") + env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} + + dia = HgDialog( + self.tr("Starting histedit session"), + self.vcs, + useClient=False) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgHisteditContinue(self, name): + """ + Public method to continue an interrupted histedit session. + + @param name file/directory name + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + # find the root of the repo + repodir = self.vcs.splitPath(name)[0] + 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 + + args = self.vcs.initCommand("histedit") + args.append("--continue") + args.append("-v") + + editor = os.path.join( + os.path.dirname(__file__), "HgHisteditEditor.py") + env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} + + dia = HgDialog( + self.tr("Continue histedit session"), + self.vcs, + useClient=False) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgHisteditAbort(self, name): + """ + Public method to abort an interrupted histedit session. + + @param name file/directory name + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + # find the root of the repo + repodir = self.vcs.splitPath(name)[0] + 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 + + args = self.vcs.initCommand("histedit") + args.append("--abort") + args.append("-v") + + editor = os.path.join( + os.path.dirname(__file__), "HgHisteditEditor.py") + env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} + + dia = HgDialog( + self.tr("Abort histedit session"), + self.vcs, + useClient=False) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgHisteditEditPlan(self, name): + """ + Public method to edit the remaining actions list of an interrupted + histedit session. + + @param name file/directory name + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + # find the root of the repo + repodir = self.vcs.splitPath(name)[0] + 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 + + args = self.vcs.initCommand("histedit") + args.append("--edit-plan") + args.append("-v") + + editor = os.path.join( + os.path.dirname(__file__), "HgHisteditEditor.py") + env = {"HGEDITOR": "{0} {1}".format(sys.executable, editor)} + + dia = HgDialog( + self.tr("Edit Plan"), + self.vcs, + useClient=False) + res = dia.startProcess(args, repodir, environment=env) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Oct 29 16:22:35 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Oct 29 19:28:04 2016 +0200 @@ -48,6 +48,7 @@ from .ShelveExtension.ProjectHelper import ShelveProjectHelper from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper from .StripExtension.ProjectHelper import StripProjectHelper + from .HisteditExtension.ProjectHelper import HisteditProjectHelper self.__extensions = { "mq": QueuesProjectHelper(), "fetch": FetchProjectHelper(), @@ -57,6 +58,7 @@ "shelve": ShelveProjectHelper(), "largefiles": LargefilesProjectHelper(), "strip": StripProjectHelper(), + "histedit": HisteditProjectHelper(), } self.__extensionMenuTitles = {}
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 29 16:22:35 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Oct 29 19:28:04 2016 +0200 @@ -148,6 +148,7 @@ from .ShelveExtension.shelve import Shelve from .LargefilesExtension.largefiles import Largefiles from .StripExtension.strip import Strip + from .HisteditExtension.histedit import Histedit self.__extensions = { "mq": Queues(self), "fetch": Fetch(self), @@ -157,6 +158,7 @@ "shelve": Shelve(self), "largefiles": Largefiles(self), "strip": Strip(self), + "histedit": Histedit(self), } def getPlugin(self):
--- a/Toolbox/Startup.py Sat Oct 29 16:22:35 2016 +0200 +++ b/Toolbox/Startup.py Sat Oct 29 19:28:04 2016 +0200 @@ -240,6 +240,9 @@ # qscintilla needed for web browser w = mwFactory(argv) + if w is None: + return 100 + if quitOnLastWindowClosed: app.lastWindowClosed.connect(app.quit) w.show()
--- a/changelog Sat Oct 29 16:22:35 2016 +0200 +++ b/changelog Sat Oct 29 19:28:04 2016 +0200 @@ -39,6 +39,7 @@ -- Mercurial --- added support for pulling and pushing the current bookmark --- added support for the strip extension + --- added support for the histedit extension --- added support for the strip and fetch extensions to the log browser - Web Browser -- added capability to remember the zoom values for each site (incl. a
--- a/eric6.e4p Sat Oct 29 16:22:35 2016 +0200 +++ b/eric6.e4p Sat Oct 29 19:28:04 2016 +0200 @@ -576,6 +576,13 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgUtilities.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/__init__.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py</Source> @@ -1589,7 +1596,6 @@ <Form>PluginManager/PluginInstallDialog.ui</Form> <Form>PluginManager/PluginRepositoryDialog.ui</Form> <Form>PluginManager/PluginUninstallDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui</Form> <Form>Plugins/AboutPlugin/AboutDialog.ui</Form> <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui</Form> <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.ui</Form> @@ -1641,6 +1647,9 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui</Form> @@ -1659,6 +1668,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui</Form> @@ -1935,14 +1945,14 @@ <Interfaces/> <Others> <Other>.hgignore</Other> + <Other>APIs/Python/zope-2.10.7.api</Other> + <Other>APIs/Python/zope-2.11.2.api</Other> + <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/Python3/PyQt4.bas</Other> <Other>APIs/Python3/PyQt5.bas</Other> <Other>APIs/Python3/QScintilla2.bas</Other> <Other>APIs/Python3/eric6.api</Other> <Other>APIs/Python3/eric6.bas</Other> - <Other>APIs/Python/zope-2.10.7.api</Other> - <Other>APIs/Python/zope-2.11.2.api</Other> - <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/QSS/qss.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
--- a/i18n/eric6_cs.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_cs.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21914,437 +21914,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <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="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <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="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <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="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <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="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <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="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <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="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <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="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23672,12 +23672,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -24260,6 +24260,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Informace</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Vybrat pro zadání revize číslem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Číslo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Zadejte číslo revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Akce</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Informace</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25530,1407 +25764,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29607,6 +29841,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Pokračovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">Přerušit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <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/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63280,167 +63625,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Skryté atributy</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation></translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> + <source>None</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> + <source>Type</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> + <source>Boolean</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> + <source>Integer</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> + <source>Long Integer</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> + <source>Float</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> + <source>Complex</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> + <source>String</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> + <source>Unicode String</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> + <source>Tuple</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> + <source>List/Array</source> + <translation></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation></translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>Soubor</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation></translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation></translation> + <source>File</source> + <translation>Soubor</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> + <source>X Range</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Třída</translation> + <source>Slice</source> + <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Interface třídy</translation> + <source>Buffer</source> + <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Metoda třídy</translation> + <source>Class</source> + <translation>Třída</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Property třídy</translation> + <source>Class Instance</source> + <translation>Interface třídy</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Generátor</translation> + <source>Class Method</source> + <translation>Metoda třídy</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Funkce</translation> + <source>Class Property</source> + <translation>Property třídy</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Generátor</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Builtin funkce</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Kód</translation> + <source>Function</source> + <translation>Funkce</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Modul</translation> + <source>Builtin Function</source> + <translation>Builtin funkce</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation></translation> + <source>Code</source> + <translation>Kód</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation></translation> + <source>Module</source> + <translation>Modul</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> + <source>Ellipsis</source> <translation></translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Jiné</translation> </message> <message> - <location filename="../Debugger/Config.py" line="30"/> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation>Množina</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71466,46 +71811,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71513,12 +71858,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="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71529,13 +71874,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_de.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_de.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21399,437 +21399,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <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="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <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="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <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="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <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="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <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="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <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="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <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="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <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="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <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="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <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="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation>Markiere als 'nicht aufgelöst'</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> @@ -23150,12 +23150,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -23722,6 +23722,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation>Änderungsbeschreibung bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation>Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation>Bearbeite die Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation>Letzte Änderungsbeschreibungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation>Wähle eine zu verwendende Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation>Information</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation>Histedit Konfiguration</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation>Startrevision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation>Auswählen, um die Standardrevision als Basis zu verwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation>Standardrevision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation>Auswählen, um alle ausgehenden Revisionen zu bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation>Alle Ausgehenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation>Auswählen, um eine Revision als Startpunkt festzulegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation>Gib eine Revisionsnummer ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation>Auswählen, um eine Revision mit ihrer Änderungssatz-ID anzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation>Auswählen, um Ausgehende zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation>Ausgehende erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation>Auswählen, um veraltete Knoten zu behalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation>Veraltete Knoten behalten</translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation>Plan bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation>Änderungsplan</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation>Aktion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation>Zusammenfassung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation>Drücken, um den gewählten Eintrag nach oben zu schieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation>Auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation>Drücken, um den gewählten Eintrag nach unten zu schieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation>Ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation>Information</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -24980,1407 +25214,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Erzeuge (klone) ein neues Projekt aus einem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Neu aus Repository</b><p>Dies erzeugt (clone) ein neues Projekt aus dem Mercurial-Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Zeige das Log eingehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zeige eingehendes Log</b><p>Dies zeigt das Log von Änderungen, die in das Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>&Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Abgleich des lokalen Projektes mit dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Abgleich mit Repository</b><p>Dies gleicht das lokale Projekt mit dem Mercurial-Repository ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Änderungen in Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>&Änderungen in Repository einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Änderungen am lokalen Projekt in das Mercurial-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Mercurial-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Zeige das Log ausgehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zeige ausgehendes Log</b><p>Dies zeigt das Log von Änderungen, die aus dem Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Änderungen hochladen</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>&Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>Änderungen &zusammenführen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Verfiziert die Integrität des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Als „gut“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Als „schlecht“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation>Änderungen an ein entferntes Repository mit der Option „force“ hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation>Phase ändern...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation>Ändert die Phase von Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation>Kopiersitzung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation>Graft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation>Status an&zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation>Übersichtsinformationen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Übersichtsinformationen anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation>Zeige Übersichtsinformationen zum Status des Arbeitsverzeichnisses</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation>Lesezeichen löschen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation>Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation>Lesezeichen umbenennen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation>Zeige eingehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation>Zeige Konflikte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation>Zeige Konflikte...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Zeige einen Dialog mit allen Dateien mit Konflikten an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation>Konflikte ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation>Änderungen verwalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> @@ -29047,6 +29281,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation>Starte histedit Sitzung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation>histedit Sitzung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation>histedit Sitzung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation>Änderungsplan bearbeiten</translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation>Starten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation>Starte eine neue Änderungshistorienbearbeitungssitzung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation><b>Starten</b><p>Dies startet eine Änderungshistorienbearbeitungssitzung. Es wird ein Dialog zur Bearbeitung des Änderungsplanes geöffnet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation>Fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation>Setze eine unterbrochene Änderungshistorienbearbeitungssitzung fort</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation><b>Fortsetzen</b><p>Dies setzt eine unterbrochene Änderungshistorienbearbeitungssitzung fort.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation>Abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation>Bricht eine unterbrochene Änderungshistorienbearbeitungssitzung ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation><b>Abbrechen</b><p>Dies bricht eine unterbrochene Änderungshistorienbearbeitungssitzung ab.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation>Plan bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation>Bearbeite die verbleibende Aktionsliste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation><b>Plan bearbeiten</b><p>Dies öffnet einen Editor zur Bearbeitung der verbleibenden Aktionen einer unterbrochenen Änderungshistorienbearbeitungssitzung.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation>Historie bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation>Historienbearbeitung starten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <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/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation>Historienbearbeitung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation>Historienbearbeitung abbrechen</translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -62492,167 +62837,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Verstecktes Attribut</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> + <location filename="../Debugger/Config.py" line="19"/> <source>None</source> <translation>None</translation> </message> <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Typ</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Integer</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Long Integer</translation> + <source>Type</source> + <translation>Typ</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Float</translation> + <source>Integer</source> + <translation>Integer</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Complex</translation> + <source>Long Integer</source> + <translation>Long Integer</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>String</translation> + <source>Float</source> + <translation>Float</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Unicode String</translation> + <source>Complex</source> + <translation>Complex</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> + <source>String</source> + <translation>String</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="27"/> + <source>Unicode String</source> + <translation>Unicode String</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="28"/> <source>Tuple</source> <translation>Tuple</translation> </message> <message> - <location filename="../Debugger/Config.py" line="29"/> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation>Dictionary Proxy</translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>Datei</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>XRange</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>Slice</translation> + <source>File</source> + <translation>Datei</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>Puffer</translation> + <source>X Range</source> + <translation>XRange</translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Klasse</translation> + <source>Slice</source> + <translation>Slice</translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Klasseninstanz</translation> + <source>Buffer</source> + <translation>Puffer</translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Klassenmethode</translation> + <source>Class</source> + <translation>Klasse</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Klasseneigenschaft</translation> + <source>Class Instance</source> + <translation>Klasseninstanz</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Generator</translation> + <source>Class Method</source> + <translation>Klassenmethode</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Funktion</translation> + <source>Class Property</source> + <translation>Klasseneigenschaft</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Generator</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Eingebaute Funktion</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Code</translation> + <source>Function</source> + <translation>Funktion</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Modul</translation> + <source>Builtin Function</source> + <translation>Eingebaute Funktion</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Ellipsis</translation> + <source>Code</source> + <translation>Code</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>Traceback</translation> + <source>Module</source> + <translation>Modul</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Frame</translation> + <source>Ellipsis</source> + <translation>Ellipsis</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>Traceback</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Frame</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Sonstiges</translation> </message> <message> - <location filename="../Debugger/Config.py" line="19"/> + <location filename="../Debugger/Config.py" line="21"/> <source>Boolean</source> <translation>Boolean</translation> </message> <message> - <location filename="../Debugger/Config.py" line="27"/> + <location filename="../Debugger/Config.py" line="29"/> <source>List/Array</source> <translation>Liste</translation> </message> <message> - <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>Dictionary</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation>Dictionary</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation>Set</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation>Unveränderliches Set</translation> </message> @@ -70652,24 +70997,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -70678,24 +71023,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -70706,12 +71051,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70722,14 +71067,14 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <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/i18n/eric6_empty.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_empty.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21269,437 +21269,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -23010,12 +23010,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -23568,6 +23568,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -24810,1407 +25044,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -28860,6 +29094,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -61914,167 +62259,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> + <source>None</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> + <source>Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> + <source>Boolean</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> + <source>Integer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> + <source>Long Integer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> + <source>Float</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> + <source>Complex</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> + <source>String</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> + <source>Unicode String</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> + <source>Tuple</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> - <source>Dictionary Proxy</source> + <source>List/Array</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="30"/> - <source>Set</source> + <source>Dictionary/Hash/Map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="31"/> - <source>Frozen Set</source> + <source>Dictionary Proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> + <source>Set</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> + <source>Frozen Set</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> + <source>File</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> + <source>X Range</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> + <source>Slice</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> + <source>Buffer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> + <source>Class</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> + <source>Class Instance</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> + <source>Class Method</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> + <source>Class Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> + <source>Function</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> + <source>Builtin Function</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> + <source>Code</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> + <source>Module</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> + <source>Ellipsis</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation type="unfinished"></translation> </message> @@ -70045,35 +70390,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70084,35 +70429,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <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="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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/i18n/eric6_en.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_en.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21290,437 +21290,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23031,12 +23031,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -23589,6 +23589,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -24831,1407 +25065,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -28890,6 +29124,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -61955,167 +62300,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> + <source>None</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> + <source>Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> + <source>Boolean</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> + <source>Integer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> + <source>Long Integer</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> + <source>Float</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> + <source>Complex</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> + <source>String</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> + <source>Unicode String</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> + <source>Tuple</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> - <source>Dictionary Proxy</source> + <source>List/Array</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="30"/> - <source>Set</source> + <source>Dictionary/Hash/Map</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> + <source>Dictionary Proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="32"/> + <source>Set</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="34"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Debugger/Config.py" line="35"/> + <source>X Range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="36"/> + <source>Slice</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="37"/> + <source>Buffer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="38"/> + <source>Class</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="39"/> + <source>Class Instance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="40"/> + <source>Class Method</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="41"/> + <source>Class Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="43"/> + <source>Function</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="45"/> + <source>Builtin Function</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="46"/> + <source>Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="47"/> + <source>Module</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="48"/> + <source>Ellipsis</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> + <source>Other</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="49"/> - <source>Other</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="31"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -70089,46 +70434,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -70136,12 +70481,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70152,13 +70497,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_es.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_es.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21417,437 +21417,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <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/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <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="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <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="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <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="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <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="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <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="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <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="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <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="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <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="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <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="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <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="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <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="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation>Marcando como 'unresolved'</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation>Marcando como 'unresolved'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> @@ -23168,12 +23168,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -23740,6 +23740,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>El archivo<b>{0}</b> no puede ser leído.<br />Causa: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">Mensaje de Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Mensajes recientes de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Información</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Seleccionar para especificar una revisión por número</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Número</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Introduzca un número de revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Seleccionar para especificar una revisión por changeset id</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Introduzca un changeset id</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introducir un nombre de branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished">Marcador:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Introduzca un nombre de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>El archivo<b>{0}</b> no puede ser leído.<br />Causa: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Acción</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Revisión</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Resumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Información</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25000,1407 +25234,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Nuevo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Mostrar log entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Mostrar el log de los cambios entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Hacer pull de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Hacer update desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>Hacer &update desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Actualizar el proyecto local desde el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Hacer commit de los cambios al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>Hacer &commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Hacer commit de los cambios al repositorio</b><p>Envía los cambios del proyecto local al repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Mostrar log saliente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Mostrar el log de los cambios salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Hacer push de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Hacer push de cambios hacia un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Mostrar &log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Mostrar el log del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>Re&vertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Crear branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>Crear &branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Verificar la integridad del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation>Crear un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation>Hacer push de cambios (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation>Exportar revisiones a archivos de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation>Cambiar la fase de revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation>Graft</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation>Con&flictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation>Mostrar Sumario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Mostrar Sumario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation>Mostrar información sumarial del estado del directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation>Cancelar merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Cancelar un merge sin commit y perder todos los cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation>Define un marcador para el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation>Borrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation>Borrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation>Borrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation>Renombrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation>Renombrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation>Renombrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation>Mover un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation>Pull de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation>Mostrar conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation>Mostrar conflictos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation>Gestionar Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> @@ -29210,6 +29444,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Continuar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">Abortar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -62629,167 +62974,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Atributos Ocultos</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>Ninguno</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Tipo</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>Booleano</translation> + <source>None</source> + <translation>Ninguno</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Entero</translation> + <source>Type</source> + <translation>Tipo</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Entero Largo</translation> + <source>Boolean</source> + <translation>Booleano</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Flotante</translation> + <source>Integer</source> + <translation>Entero</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Complejo</translation> + <source>Long Integer</source> + <translation>Entero Largo</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>Cadena</translation> + <source>Float</source> + <translation>Flotante</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Cadena Unicode</translation> + <source>Complex</source> + <translation>Complejo</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> - <translation>Tupla</translation> + <source>String</source> + <translation>Cadena</translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> - <translation>Lista/Array</translation> + <source>Unicode String</source> + <translation>Cadena Unicode</translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>Diccionario/Hash/Mapa</translation> + <source>Tuple</source> + <translation>Tupla</translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> + <source>List/Array</source> + <translation>Lista/Array</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation>Diccionario/Hash/Mapa</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation>Proxy a Diccionario</translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>Archivo</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>Rango X</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>Slice</translation> + <source>File</source> + <translation>Archivo</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>Buffr</translation> + <source>X Range</source> + <translation>Rango X</translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Clase</translation> + <source>Slice</source> + <translation>Slice</translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Instancia de Clase</translation> + <source>Buffer</source> + <translation>Buffr</translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Método de Clase</translation> + <source>Class</source> + <translation>Clase</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Propiedad de Clase</translation> + <source>Class Instance</source> + <translation>Instancia de Clase</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Generador</translation> + <source>Class Method</source> + <translation>Método de Clase</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Función</translation> + <source>Class Property</source> + <translation>Propiedad de Clase</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Generador</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Función de serie (builtin)</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Código</translation> + <source>Function</source> + <translation>Función</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Módulo</translation> + <source>Builtin Function</source> + <translation>Función de serie (builtin)</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Elipse</translation> + <source>Code</source> + <translation>Código</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>Trazado</translation> + <source>Module</source> + <translation>Módulo</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Frame</translation> + <source>Ellipsis</source> + <translation>Elipse</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>Trazado</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Frame</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Otro</translation> </message> <message> - <location filename="../Debugger/Config.py" line="30"/> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation>Establecer</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -70799,17 +71144,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -70820,31 +71165,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -70853,12 +71198,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70875,14 +71220,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
--- a/i18n/eric6_fr.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_fr.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21880,437 +21880,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <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="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <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="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <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="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <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="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23640,12 +23640,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -24223,6 +24223,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">Message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Messages de commit récents</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Sélectionner un message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Information</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Numéro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Entrer un numéro de révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Action</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Bilan</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Information</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25493,1407 +25727,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation type="unfinished">Nouveau à partir du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation type="unfinished">&Nouveau depuis un référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation type="unfinished">Mettre à jo&ur à partir du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation type="unfinished">"Commiter" les modifications au référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation type="unfinished">&Appliquer les changements dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation type="unfinished">Exporter du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation type="unfinished">&Exporter du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation type="unfinished">Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation type="unfinished">Afficher le &log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation type="unfinished">Affiche le log du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation type="unfinished">Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation type="unfinished">&Recharger le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation type="unfinished">&Fusionner les modifications...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation type="unfinished">&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation type="unfinished">Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation type="unfinished">Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation type="unfinished">Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation type="unfinished">Liste les branches du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation type="unfinished">Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation type="unfinished">&Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation type="unfinished">Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished">Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished">Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished">Lister les signets ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished">Lister les signets du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished">Définir signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished">Définir signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished">Définir un signet pour le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished">Supprimer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished">Supprimer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished">Supprimer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished">Renommer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished">Renommer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished">Renommer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished">Déplacer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished">Déplacer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished">Déplacer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished">Montrer nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished">Montrer la liste des nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished">Télécharger signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished">Montrer signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Montrer la list des signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29554,6 +29788,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Continuer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63241,167 +63586,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Attributs cachés</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>Aucun</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Type</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>Booléen</translation> + <source>None</source> + <translation>Aucun</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Entier</translation> + <source>Type</source> + <translation>Type</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Entier long</translation> + <source>Boolean</source> + <translation>Booléen</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Flottant</translation> + <source>Integer</source> + <translation>Entier</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Complexe</translation> + <source>Long Integer</source> + <translation>Entier long</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>Chaine de caractères</translation> + <source>Float</source> + <translation>Flottant</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Chaine Unicode</translation> + <source>Complex</source> + <translation>Complexe</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> + <source>String</source> + <translation>Chaine de caractères</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="27"/> + <source>Unicode String</source> + <translation>Chaine Unicode</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="28"/> <source>Tuple</source> <translation>Tuple</translation> </message> <message> - <location filename="../Debugger/Config.py" line="29"/> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation>Dictionaire Proxy</translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>Fichier</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>Range X</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>Tranche</translation> + <source>File</source> + <translation>Fichier</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>Buffer</translation> + <source>X Range</source> + <translation>Range X</translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Classe</translation> + <source>Slice</source> + <translation>Tranche</translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Instance de classe</translation> + <source>Buffer</source> + <translation>Buffer</translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Méthode de classe</translation> + <source>Class</source> + <translation>Classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Propriété de classe</translation> + <source>Class Instance</source> + <translation>Instance de classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Générateur</translation> + <source>Class Method</source> + <translation>Méthode de classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Fonction</translation> + <source>Class Property</source> + <translation>Propriété de classe</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Générateur</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Fonction interne</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Code</translation> + <source>Function</source> + <translation>Fonction</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Module</translation> + <source>Builtin Function</source> + <translation>Fonction interne</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Ellipse</translation> + <source>Code</source> + <translation>Code</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>Traceback</translation> + <source>Module</source> + <translation>Module</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Frame</translation> + <source>Ellipsis</source> + <translation>Ellipse</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>Traceback</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Frame</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Autre</translation> </message> <message> - <location filename="../Debugger/Config.py" line="27"/> + <location filename="../Debugger/Config.py" line="29"/> <source>List/Array</source> <translation>Liste/Tableau</translation> </message> <message> - <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>Dictionnaire/Hash/Map</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation>Dictionnaire/Hash/Map</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation type="unfinished">Liste</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71440,24 +71785,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -71466,23 +71811,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71493,12 +71838,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71509,13 +71854,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_it.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_it.ts Sat Oct 29 19:28:04 2016 +0200 @@ -22078,437 +22078,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <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="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <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="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <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="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <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="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <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="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <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="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <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="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <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="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <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="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <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="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23841,12 +23841,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -24439,6 +24439,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">Messaggio di commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Messagi di commit recenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Seleziona un messaggio di commit recete da usare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Informazione</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Numero</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Inserisci un numero di revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Inserisci id del changeset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished">Seleziona per specificare una revisione tramite segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished">Segnalibro:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Digita un nome per il segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Azione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Sommario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished">Su</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished">Giù</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Informazione</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25723,1407 +25957,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Nuovo dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Nuovo dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crea (clone) un nuovo progetto da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuovo dal repository</b><p>Crea (clone) un nuovo progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Mostra log in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Mostra il log delle modifiche in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostra log in ingresso</b><p>Mostra il log delle modifiche che entrano nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Pull modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Pull changes da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Pull modifiche</b><p>Scarica le modifiche da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Aggiorna da repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>&Aggiorna da repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Aggiorna il progetto locate da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Aggiorna dal repository</b><p>Aggiorna il progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Committa le modifica nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>&Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Committa le modifiche al progetto locale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Committa modifiche al repository</b><p>Committa le modifiche al progetto locale nel repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Mostra log in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Mostra il log della modifiche in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostra log in uscita</b><p>Mostra il log della modifiche che escono dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Push modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Push modifiche ad un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Push delle modifiche</b><p>Push delle modifiche dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Esporta dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Esporta dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Esporta il progetto dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Mostra log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Mostra &log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Mostra i log del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Mostra &differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Mostra head</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Mostra head del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Mostra predecessori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Mostra il predecessori del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Mostra tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Mostra il tip del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>In&verti modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation>Fondi le modifiche dela revisione nel progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>Tag del progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Elenca tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Elenca i branches del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Crea Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>Crea &Branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Switch della directory di lavoro ad un'altra revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Esegui un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation>Mostra alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Verifica repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Verifica repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Verifica l'integrità del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation>Crea una file .hgignore con i valori di default</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation>Crea changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Mostra il brach corrente del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation>Segna un chageset selezionabile come good</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation>Segna un chageset selezionabile come bad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation>Push delle modifiche (forza)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation>Push delle modifiche verso un repository remoto con l'opzione force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished">Lista i segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished">Lista i segnalibri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished">Lista i segnalibri del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished">Definisci un segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished">Definisci un segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished">Definisci un segnalibro per il progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished">Cancella segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished">Cancella un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished">Rinomina segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished">Rinomina segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished">Rinomina un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished">Sposta segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished">Sposta segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished">Sposta un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished">Mostra i segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished">Estrae segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished">Mostra segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished">Inserisci segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29810,6 +30044,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Continua</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">Termina</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <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/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63602,167 +63947,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Attributi nascosti</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>Nessuno</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Tipo</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>Boolean</translation> + <source>None</source> + <translation>Nessuno</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Integer</translation> + <source>Type</source> + <translation>Tipo</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Long Integer</translation> + <source>Boolean</source> + <translation>Boolean</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Float</translation> + <source>Integer</source> + <translation>Integer</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Complex</translation> + <source>Long Integer</source> + <translation>Long Integer</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>String</translation> + <source>Float</source> + <translation>Float</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Unicode String</translation> + <source>Complex</source> + <translation>Complex</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> + <source>String</source> + <translation>String</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="27"/> + <source>Unicode String</source> + <translation>Unicode String</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="28"/> <source>Tuple</source> <translation>Tuple</translation> </message> <message> - <location filename="../Debugger/Config.py" line="29"/> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation>Dizionario Proxy</translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>File</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>X Range</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>Slice</translation> + <source>File</source> + <translation>File</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>Buffer</translation> + <source>X Range</source> + <translation>X Range</translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Classe</translation> + <source>Slice</source> + <translation>Slice</translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Istanza di classe</translation> + <source>Buffer</source> + <translation>Buffer</translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Metodo di classe</translation> + <source>Class</source> + <translation>Classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Proprietà di classe</translation> + <source>Class Instance</source> + <translation>Istanza di classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Generatore</translation> + <source>Class Method</source> + <translation>Metodo di classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Funzione</translation> + <source>Class Property</source> + <translation>Proprietà di classe</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Generatore</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Funzione predefinita</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Codice</translation> + <source>Function</source> + <translation>Funzione</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Modulo</translation> + <source>Builtin Function</source> + <translation>Funzione predefinita</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Ellisse</translation> + <source>Code</source> + <translation>Codice</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>Traceback</translation> + <source>Module</source> + <translation>Modulo</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Frame</translation> + <source>Ellipsis</source> + <translation>Ellisse</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>Traceback</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Frame</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Altro</translation> </message> <message> - <location filename="../Debugger/Config.py" line="27"/> + <location filename="../Debugger/Config.py" line="29"/> <source>List/Array</source> <translation>Lista/Array</translation> </message> <message> - <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>Dizionario/Hash/Map</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation>Dizionario/Hash/Map</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation>Set</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71800,24 +72145,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -71826,24 +72171,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71853,12 +72198,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71875,13 +72220,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_pt.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_pt.ts Sat Oct 29 19:28:04 2016 +0200 @@ -22049,437 +22049,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>O processo hg terminou com o código de saída {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <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/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Criar repositorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>A criar repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <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="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <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="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <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="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <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="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <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="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <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="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <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="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation>Aplicar Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation>A marcar como 'sem resolver'</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation>A marcar como 'sem resolver'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <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="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <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="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <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="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <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="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -23831,12 +23831,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -24435,6 +24435,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>O ficheiro <b>{0}</b> não se pôde ler. </p><p>Motivo: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">Mensagem de Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Informação</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Número</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Introduzir um número de revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Introduzir um id do conjunto de alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Etiqueta:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzir o nome da etiqueta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Ramo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introduzir um nome de ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished">Selecionar para especificar uma revisão por um marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished">Marcador:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Introduzir um nome de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>O ficheiro <b>{0}</b> não se pôde ler. </p><p>Motivo: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Ação</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Revisão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Sumário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Informação</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25705,1407 +25939,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Novo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Novo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Novo desde repositorio</b><p>Cria (clona) um projeto local novo desde um repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Mostrar registo entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Mostrar o registo de alterações entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar registo entrante</b><p>Mostra o registo das alterações entrantes ao repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Puxar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Puxar alterações do repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Puxar alterações</b><p>Puxa alterações do repositorio remoto para o repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Atualizar desde o repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>At&ualizar desde o repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Atualizar o projeto local desde o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Atualizar desde o repositorio</b><p>Atualiza o projeto local desde o repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Mostrar registo de saída</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Mostrar o registo de alterações saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Empurrar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Empurra alterações ao repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Empurrar alterações</b><p>Empurra as alterações do repositorio local a um repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation>Empurrar alterações (forçar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation>Empurra alterações ao repositorio remoto com a opção force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Empurrar alterações (forçar)</b><p>Empurra as alterações do repositorio local a um repositorio remoto usando a opção 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Exportar do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Exportar do repositório...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Exportar o projeto do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Mostrar registo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Mostrar re&gisto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Mostra o registo do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Mostrar navegador de registos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Mostrar &diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation type="unfinished">Mostrar estado do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Mostrar cabeçalhos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Mostrar os cabeçalhos do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Mostrar pais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Mostrar os pais do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Mostrar dica</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Mostrar a dica do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>&Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>&Mesclar alterações...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Listar ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Listar ramos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Listar os ramos do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Criar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>Criar &ramo...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Criar um ramo novo para o projeto local no repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Criar ramo</b><p>Cria um ramo novo para o projeto local no repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Fechar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Fechar o ramo atual no projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Mostrar ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Mostrar o ramo atual do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>M&udar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Mudar o diretorio de trabalho a outra revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Limpar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>Lim&par</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Limpar o projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Executar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>E&xecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Executa um comando de Mercurial arbitrário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostra a caixa de diálogo de configuração com a página de Mercurial selecionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Mostrar rotas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Mostrar rotas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Verificar a integridade do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Criar .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation type="unfinished">Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Marcar como "bom"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Marcar como "bom"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Marcar como "mau"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Marcar como "mau"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Restablecer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation>Empurrar ramo novo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation>Editar configuração de usuário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation>Editar configuração de usuário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation>Saltar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished">Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished">Conflitos resolvidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation>Adicionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation>Retirar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation>Retirar sub repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation>Mostrar Sumário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Mostrar sumário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation>Mostrar informação sumária do estado do diretorio de trabalho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation>Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation>Mostrar conflitos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation>Mostrar conflitos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation>Conflitos sem resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation>Listar marcadores do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation>Definir um marcador para o projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation>Apagar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation>Apagar Marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation>Apagar um marcador do projeto </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation>Renomear marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation>Renomear marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation>Renomear um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation>Mover um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation>Mostrar uma lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation>Puxar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation>Puxa um marcador desde um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation>Mostrar a lista de marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation>Empurrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation>Empurrar um marcador a um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation>Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation>Ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation>Gerir Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29913,6 +30147,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished">Iniciar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Continuar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63312,167 +63657,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Atributos Escondidos</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>None</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Tipo</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>Boliano</translation> + <source>None</source> + <translation>None</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Inteiro</translation> + <source>Type</source> + <translation>Tipo</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Inteiro Longo</translation> + <source>Boolean</source> + <translation>Boliano</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Flutuante</translation> + <source>Integer</source> + <translation>Inteiro</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Complexo</translation> + <source>Long Integer</source> + <translation>Inteiro Longo</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>String</translation> + <source>Float</source> + <translation>Flutuante</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>String Unicode</translation> + <source>Complex</source> + <translation>Complexo</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> - <translation>Tupla</translation> + <source>String</source> + <translation>String</translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> - <translation>Vector/Matriz</translation> + <source>Unicode String</source> + <translation>String Unicode</translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation type="unfinished"></translation> + <source>Tuple</source> + <translation>Tupla</translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> - <source>Dictionary Proxy</source> - <translation type="unfinished"></translation> + <source>List/Array</source> + <translation>Vector/Matriz</translation> </message> <message> <location filename="../Debugger/Config.py" line="30"/> - <source>Set</source> - <translation type="unfinished">Definir</translation> + <source>Dictionary/Hash/Map</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> + <source>Dictionary Proxy</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>Ficheiro</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation type="unfinished"></translation> + <source>Set</source> + <translation type="unfinished">Definir</translation> </message> <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation type="unfinished"></translation> + <source>File</source> + <translation>Ficheiro</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> + <source>X Range</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Classe</translation> + <source>Slice</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Instância da Classe</translation> + <source>Buffer</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Método da Classe</translation> + <source>Class</source> + <translation>Classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Propriedad da Classe</translation> + <source>Class Instance</source> + <translation>Instância da Classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Gerador</translation> + <source>Class Method</source> + <translation>Método da Classe</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Função</translation> + <source>Class Property</source> + <translation>Propriedad da Classe</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Gerador</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Função Interna</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Código</translation> + <source>Function</source> + <translation>Função</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Módulo</translation> + <source>Builtin Function</source> + <translation>Função Interna</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Elipse</translation> + <source>Code</source> + <translation>Código</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation type="unfinished"></translation> + <source>Module</source> + <translation>Módulo</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Marco</translation> + <source>Ellipsis</source> + <translation>Elipse</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Marco</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>Outro</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71466,24 +71811,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -71492,24 +71837,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71520,12 +71865,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71542,13 +71887,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_ru.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_ru.ts Sat Oct 29 19:28:04 2016 +0200 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation>Добавить закладку</translation> </message> @@ -1680,7 +1680,7 @@ <translation>Удалить выбранные элементы</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation>&Удалить</translation> </message> @@ -2403,12 +2403,12 @@ <translation>Сохранить трассировку вызовов как текстовый файл</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation>От</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation>До</translation> </message> @@ -2516,7 +2516,7 @@ <translation>Очистить список хостов</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation>Очистить</translation> </message> @@ -2874,7 +2874,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation>Белый список ClickToFlash</translation> </message> @@ -4801,7 +4801,7 @@ <translation>Домен:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation><куки не выбраны></translation> </message> @@ -7392,7 +7392,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation>Загрузки</translation> </message> @@ -7856,92 +7856,92 @@ <translation>Стандартные кнопки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation>Применить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation>Игнорировать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation>Нет для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation>Восстановить умолчания</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation>Повтор</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation>Да</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation>Да для всех</translation> </message> @@ -9960,7 +9960,7 @@ <translation>Выбор API-файла из списка установленных файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/> <source>Add from installed APIs</source> <translation>Добавить из списка установленных файлов API</translation> </message> @@ -9970,7 +9970,7 @@ <translation>Выбор API-файла из списка API-файлов установленных плагинов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/> <source>Add from Plugin APIs</source> <translation>Добавить из списка файлов API, установленных с помощью плагинов</translation> </message> @@ -9980,7 +9980,7 @@ <translation>Компиляция выбранных определений API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> <source>Compile APIs</source> <translation>Компилировать API</translation> </message> @@ -11025,7 +11025,7 @@ <translation>Выберите шрифт.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation>Шрифт</translation> </message> @@ -11035,7 +11035,7 @@ <translation>Разрешить заливку фона до конца строки.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/> <source>Fill to end of line</source> <translation>Заливка до конца строки</translation> </message> @@ -12557,7 +12557,7 @@ <translation>Режим:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation>Отключена</translation> </message> @@ -13266,7 +13266,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="339"/> <source>Send bug report</source> <translation>Отправить сообщение об ошибке</translation> </message> @@ -14671,12 +14671,12 @@ <translation>Уведомления</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation>Разрешение</translation> </message> @@ -14691,7 +14691,7 @@ <translation>Удалить все</translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation>Геолокация</translation> </message> @@ -15818,7 +15818,7 @@ <translation>Имя:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation><нет выделенных флэш-куки></translation> </message> @@ -15828,7 +15828,7 @@ <translation>Размер:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation>Источник:</translation> </message> @@ -15863,7 +15863,7 @@ <translation>Удалить выбранные флэш-куки</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation>Удалить куки</translation> </message> @@ -16292,7 +16292,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation>Инсталляция GreaseMonkey скрипта</translation> </message> @@ -21462,437 +21462,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершен с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation>Невозможно создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Mercurial: Создание репозитория </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>Mercurial: Первичная фиксация в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation>Mercurial: Клонирование проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation>Mercurial: Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Mercurial: Добавление файлов/директорий в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Mercurial: Удаление файлов/директорий из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Откат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <source>Pulling from a remote Mercurial repository</source> <translation>Mercurial: Затягивание (загрузка) изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Передача (проталкивание) изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation>Mercurial: Создание ветви в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная Bisect подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation>Вершина текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation>Отмена незавершённого слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Mercurial: Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation>Пометить как 'неразрешенный'</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation>Пометить как 'неразрешенный'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation>Пометить как 'разрешенный'</translation> </message> @@ -21900,7 +21900,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> @@ -22991,7 +22991,7 @@ <translation>Пометить выбранные конфликты как 'разрешенные'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation>Разрешённые</translation> </message> @@ -23001,7 +23001,7 @@ <translation>Пометить выбранные конфликты как 'неразрешенные'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation>Неразрешённые</translation> </message> @@ -23211,12 +23211,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> @@ -23594,7 +23594,7 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation>Ревизия</translation> </message> @@ -23784,6 +23784,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Недавние сообщения фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Выберите недавнее сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Информация</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Номер</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Задайте номер ревизии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Введите имя тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Разрешить задание ревизии с помощью ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Ветвь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished">Разрешить задание ревизии с помощью закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Введите имя закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">Действие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Ревизия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Итого</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Информация</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -23874,7 +24108,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Mercurial: Журнал</translation> </message> @@ -23914,17 +24148,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -25043,1407 +25277,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>&Новый из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Mercurial: Создание (клонирование) нового проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Новый из репозитория</b><p>Создание (клонирование) нового локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Показать журнал входящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Показать журнал входящих</b><p>Отображение журнала входящих в репозиторий изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Затянуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Затягивание (загрузка) изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Затянуть изменения</b><p>Затягивание (загрузка) изменений из удаленного репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>&Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial: Обновить локальный проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Обновить из репозитория</b><p>Обновление локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Фиксация изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>&Фиксация изменений в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Mercurial: Фиксация изменений локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Фиксация изменений в репозитории</b><p>Фиксация изменений локального проекта в Mercurial репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation>Показать журнал исходящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation>Показать журнал исходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Показать журнал исходящих</b><p>Отображение журнала исходящих из репозитория изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>Протолкнуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Протолкнуть (передать) изменения в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть изменения</b><p>Передать изменения из локального проекта в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation>Протолкнуть изменения (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation>Протолкнуть (передать) изменения в удалённый репозиторий (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Протолкнуть изменения (принудительно)</b><p>Передача изменений в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Показать историю ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Показать &историю ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Показать историю изменений локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать историю</b><p>Отображение истории изменений локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Показать браузер журнала</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать браузер журнала</b><p>Отображение диалога просмотра журнала локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Показать &различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation>Показать вершину</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation>Показать вершину репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать вершину</b><p>Отображение вершины репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>От&катить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation>Откатить все изменения в локальном проекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Откатить изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Тег в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>&Тег в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>Тег локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>Список тегов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation>Отображение текущей ветви проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>Пе&реключиться (switch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочую директорию на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Настройка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настройка</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Идентификация</b><p>Идентифицируйте директорию проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation>Просмотр группы изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Просмотр файла, содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation>Применить один или несколько файлов групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation>Пометить как "хорошая"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation>Пометить как "хорошая"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation>Пометить как "плохая"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохая"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation>Сбросить результаты поиска Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сброс результатов поиска bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation>Автономный сервер репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation>Автономный сервер репозитория проекта...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation>Запуск автономного сервера репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation>Специальные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation>Управление группами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Затянуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation>Протолкнуть новую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Протолкнуть (передать) текущую ветвь локального проекта как новую именованную ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Протолкнуть новую ветвь</b><p>Передать текущую ветвь локального проекта как новую именованную ветвь.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation>Плагины (расширения)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation>Привка конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation>Правка конфигурации репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation>Отображение редактора для правки конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation>Показать обобщенные параметры настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation>Показать обобщенные параметры настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation>Пропустить выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить выбранные изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation>Импорт патча...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation>Импортировать патч из патч-файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Импорт патч</b><p>Импортирование патча из патч-файла в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation>Откатить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation>Экспорт патчей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation>Экспорт ревизий в патч-файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Экспорт патчей</b><p>Экспорт изменений проекта в патч-файлы.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation>Изменить фазу...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation>Изменить фазу ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation>Копирование в текущую ветвь наборов изменений из другой ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Копировать наборы изменений</b><p>Копирование в текущую рабочую директорию наборов изменений из другой ветви , сохраняются имя пользователя, дата и описание оригинальных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation>Продолжить сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Продолжение последней сессии копирования (после разрешения конфликтов)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Продолжить копировать изменения</b><p>Продолжение последней сессии копирования после разрешения конфликтов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation>Graft (копировать в текущую ветвь)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation>Копировать изменения (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation>Разрешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation>Разрешенные кон&фликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Пометить выбранные конфликты как разрешенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Разрешенные конфликты</b><p>Пометка всех конфликтов локального проекта как разрешенных.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation>Удалить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation>Показать &статус...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation>Показать сводку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation>Показать сводку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation>Отображение суммарной информации о статусе рабочей директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation>Создать неверсированный архив...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Отмена последней транзакции</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation>Администрирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation>Отменить незавершённое слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation>Отменить незавершённое слияние с потерей всех изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Отменить незавершённое слияние</b><p>Отмена незавершённого слияния с потерей всех изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation>Список закладок...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation>Список закладок проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation>Определить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation>Удалить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation>Удалить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation>Переименовать закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation>Переименовать закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation>Переместить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другую набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation>Показать входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation>Показать список входящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation>Затянуть (загрузить) закладку из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть закладку</b><p>Загрузка закладки из удалённого репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation>Показать исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation>Показать список исходящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation>Протолкнуть закладку в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть закладку</b><p>Передача закладки из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation>Ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Повторить слияние всех конфликтующих, неразрешенных файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation>Показать конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation>Показать конфликты...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation>Отображение диалога перечисления всех файлов, содержащих конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation>Неразрешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Пометить все конфликты локального проекта как неразрешенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Неразрешенные конфликты</b><p>Маркировка всех конфликтов локального проекта как неразрешенных.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation>Управление изменениями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Повторное слияние</b><p>Повторное слияние всех конфликтующих, неразрешенных файлов проекта, без учета всех предыдущих попыток слияния.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation>Затянуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation>Затянуть текущую закладку из удаленного репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть текущую закладку</b><p>Получение текущей закладки из удаленного репозитория в локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation>Протолкнуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation>Протолкнуть текущую закладку в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть текущую закладку</b><p>Отправка текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> </message> @@ -27792,7 +28026,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Status</source> <translation>Mercurial: Статус </translation> </message> @@ -27934,7 +28168,7 @@ <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> <source>Commit</source> <translation>Фиксация</translation> </message> @@ -28054,7 +28288,7 @@ <translation>все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> <source>Differences</source> <translation>Различия</translation> </message> @@ -29119,6 +29353,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished">Начать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Продолжить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">Прервать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -29136,7 +29481,7 @@ <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation>&Удалить</translation> </message> @@ -35006,92 +35351,92 @@ <translation>Стандартные кнопки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation>Применить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation>Прервать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation>Игнорировать</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation>Да для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation>Нет для всех</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation>Повтор</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation>Восстановить умолчания</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation>Да</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation>Закрыть</translation> </message> @@ -36793,7 +37138,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation>Некэшированные хосты</translation> </message> @@ -36901,7 +37246,7 @@ <translation>Задать координаты визуально</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation>Визуальный выбор</translation> </message> @@ -37574,7 +37919,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation>Сохранённые пароли</translation> </message> @@ -42357,7 +42702,7 @@ <translation>Выполнено</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation>Охват</translation> </message> @@ -42438,7 +42783,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation>%v из %m файлов</translation> </message> @@ -42446,7 +42791,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation>Результаты профайлера</translation> </message> @@ -47178,7 +47523,7 @@ <translation>Удалить выделенные фильтры</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation>Удалить фильтры</translation> </message> @@ -47188,7 +47533,7 @@ <translation>Удалить выбранные атрибуты</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation>Удалить атрибуты</translation> </message> @@ -48703,7 +49048,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation>Отправить реферер белого списка</translation> </message> @@ -49918,7 +50263,7 @@ <translation>К&опировать превью</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation>Снимки eric6</translation> </message> @@ -52438,7 +52783,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation>Subversion: Отображение различий</translation> </message> @@ -52741,17 +53086,17 @@ <translation>Выберите поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/> <source>Revision</source> <translation>Ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -53214,7 +53559,7 @@ <translation><b>URL</b><p>Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation>&URL репозитория:</translation> </message> @@ -53309,7 +53654,7 @@ <translation>Задайте протокол доступа к репозиторию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation>&URL репозитория:</translation> </message> @@ -54519,7 +54864,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> <source>Subversion Status</source> <translation>Subversion: Статус</translation> </message> @@ -54796,7 +55141,7 @@ <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> <source>Commit</source> <translation>Фиксация</translation> </message> @@ -60028,7 +60373,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="14"/> + <location filename="../PyUnit/UnittestDialog.py" line="400"/> <source>Unittest</source> <translation>Unittest</translation> </message> @@ -70880,24 +71225,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -70907,23 +71252,23 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -70934,12 +71279,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70956,14 +71301,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr></translation>
--- a/i18n/eric6_tr.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_tr.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21873,437 +21873,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <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="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <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="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <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="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23633,12 +23633,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <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> @@ -24231,6 +24231,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">Teslimat mesajı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">Geçmiş teslimet mesajları</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Geçmiş kayıt mesajlarından seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">Bilgi</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">Numara</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">Gözden geçirme numarası gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Değişiklik set kimliğini gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">İşlem</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">Özet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished">Up</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished">Down</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">Bilgi</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25484,1407 +25718,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>Kaynak havuzundan yeni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>Kay&nak havuzundan yeni...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Mercurial proje havuzundan yeni bir proje oluştur(klonla)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation>Giren günlük kaydını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation>Değişiklikleri çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation>Değişiklileri uzak kaynak havuzundan çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Değişiklikleri çek</b><p>Bu uzaktaki bir kaynak havuzundan yerel koynak havuzuna değişiklileri çeker.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>Kaynak Havuzundan güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>Kaynak Hav&uzundan güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial kaynak havuzundan yerel projeyi güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Kaynak havuzundan güncelle</b><p>Bu güncelleme yerel projeyi Mercural kaunak havuzundan günceller.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak ha&vuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation>değişiklikleri kabul et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation>Uzak kaynak havuzuna değişiklikleri gönder</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>Kayıtı &göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>Yerel projenin günlük kaydını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Farkları gös&ter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>Etiketleri listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Etiketleri listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>Branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>Branşlar listesi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>Prosenin branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished">Ekle...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29555,6 +29789,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished">Başla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">Devam et</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">Vazgeç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <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/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63014,167 +63359,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>Gizli Nitelikler</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>Yok</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>Tip</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>Boolean</translation> + <source>None</source> + <translation>Yok</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>Tamsayı</translation> + <source>Type</source> + <translation>Tip</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>Uzun Tamsayı</translation> + <source>Boolean</source> + <translation>Boolean</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>Kayar Sayı</translation> + <source>Integer</source> + <translation>Tamsayı</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>Kompleks</translation> + <source>Long Integer</source> + <translation>Uzun Tamsayı</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>Karakter Dizini</translation> + <source>Float</source> + <translation>Kayar Sayı</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Evrensel Metin</translation> + <source>Complex</source> + <translation>Kompleks</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> - <translation>Tüp</translation> + <source>String</source> + <translation>Karakter Dizini</translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> - <translation>Liste/Dizilim</translation> + <source>Unicode String</source> + <translation>Evrensel Metin</translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>Söslük/Karışık/Harita</translation> + <source>Tuple</source> + <translation>Tüp</translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> - <source>Dictionary Proxy</source> - <translation>Sölük Proxy</translation> + <source>List/Array</source> + <translation>Liste/Dizilim</translation> </message> <message> <location filename="../Debugger/Config.py" line="30"/> - <source>Set</source> - <translation>Ayarla</translation> + <source>Dictionary/Hash/Map</source> + <translation>Söslük/Karışık/Harita</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> + <source>Dictionary Proxy</source> + <translation>Sölük Proxy</translation> </message> <message> <location filename="../Debugger/Config.py" line="32"/> + <source>Set</source> + <translation>Ayarla</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="34"/> <source>File</source> <translation>Dosya</translation> </message> <message> + <location filename="../Debugger/Config.py" line="35"/> + <source>X Range</source> + <translation>X değer aralığı</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="36"/> + <source>Slice</source> + <translation>Dilim</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="37"/> + <source>Buffer</source> + <translation>Tampon</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="38"/> + <source>Class</source> + <translation>Sınıf</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="39"/> + <source>Class Instance</source> + <translation>Örnek Sınıf</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="40"/> + <source>Class Method</source> + <translation>Sınıf metodu</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="41"/> + <source>Class Property</source> + <translation>Sınıf özellikleri</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>Üretici</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="43"/> + <source>Function</source> + <translation>Fonksiyon</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="45"/> + <source>Builtin Function</source> + <translation>Yerleşik Fonksiyonlar</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="46"/> + <source>Code</source> + <translation>Kod</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="47"/> + <source>Module</source> + <translation>Modül</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="48"/> + <source>Ellipsis</source> + <translation>Elips</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>Geriiz</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>Çerçeve</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> + <source>Other</source> + <translation>Diğer</translation> + </message> + <message> <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>X değer aralığı</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>Dilim</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>Tampon</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>Sınıf</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>Örnek Sınıf</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>Sınıf metodu</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>Sınıf özellikleri</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>Üretici</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>Fonksiyon</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>Yerleşik Fonksiyonlar</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>Kod</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>Modül</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>Elips</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>Geriiz</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>Çerçeve</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="49"/> - <source>Other</source> - <translation>Diğer</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="31"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71188,24 +71533,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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> @@ -71214,23 +71559,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71241,12 +71586,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71257,13 +71602,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_zh_CN.ts Sat Oct 29 16:22:35 2016 +0200 +++ b/i18n/eric6_zh_CN.ts Sat Oct 29 19:28:04 2016 +0200 @@ -21861,437 +21861,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> <translation>hg 进程已结束，返回值为 {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The hg process did not finish within 30s.</source> <translation>hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> <translation>无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Create project repository</source> <translation>创建项目仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>The project repository could not be created.</source> <translation>无法创建项目仓库。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> <source>Creating Mercurial repository</source> <translation>创建 Mercurial 仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Initial commit to Mercurial repository</source> <translation>向 Mercurial 仓库进行初始提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> <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="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <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="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3373"/> <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="3516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518"/> <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="2950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3223"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <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="3292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3294"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/> <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="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/> <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="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> <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="1877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <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="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3628"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3718"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3808"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3821"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/> <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="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23621,12 +23621,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="171"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -24209,6 +24209,240 @@ </message> </context> <context> + <name>HgHisteditCommitEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source>Edit Commit Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="27"/> + <source>Commit Message</source> + <translation type="unfinished">提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="33"/> + <source>Edit the commit message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="43"/> + <source>Recent commit messages</source> + <translation type="unfinished">最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="50"/> + <source>Select a recent commit message to use</source> + <translation type="unfinished">选择使用一个最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.ui" line="58"/> + <source>Information</source> + <translation type="unfinished">信息</translation> + </message> +</context> +<context> + <name>HgHisteditConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="14"/> + <source>Histedit Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="23"/> + <source>Start Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="29"/> + <source>Select to use the default revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="32"/> + <source>Default Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="42"/> + <source>Select to edit all outgoing revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="45"/> + <source>All Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="52"/> + <source>Select to use a revision as start point</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="68"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="74"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">选择通过号码指定一个修订</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="77"/> + <source>Number</source> + <translation type="unfinished">号码</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="90"/> + <source>Enter a revision number</source> + <translation type="unfinished">输入一个修订号</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="116"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="119"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="132"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="139"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="142"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="152"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="162"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="165"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="175"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="185"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="188"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="204"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="223"/> + <source>Select to force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="226"/> + <source>Force outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="233"/> + <source>Select to keep old nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.ui" line="236"/> + <source>Keep old nodes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgHisteditPlanEditor</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="33"/> + <source>Modification Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="61"/> + <source>Action</source> + <translation type="unfinished">动作</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="66"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="71"/> + <source>Summary</source> + <translation type="unfinished">摘要</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="94"/> + <source>Press to move the selected entry up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="97"/> + <source>Up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="104"/> + <source>Press to move the selected entry down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="107"/> + <source>Down</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="130"/> + <source>Information</source> + <translation type="unfinished">信息</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -25480,1407 +25714,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>New from repository</source> <translation>从仓库新建</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>&New from repository...</source> <translation>从仓库新建(&N)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Update from repository</source> <translation>从仓库更新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>&Update from repository</source> <translation>从仓库更新(&U)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>Commit changes to repository</source> <translation>将更改提交到仓库中</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> <source>&Commit changes to repository...</source> <translation>将更改提交到仓库中(&C)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Export from repository</source> <translation>从仓库导出</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>&Export from repository...</source> <translation>从仓库导出(&E)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Export a project from the repository</source> <translation>从仓库中导出一个项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log</source> <translation>显示日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show &log</source> <translation>显示日志(&l)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show the log of the local project</source> <translation>显示本地项目的日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>显示日志</b><p>显示本地项目的日志。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show a dialog to browse the log of the local project</source> <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation type="unfinished">显示差异(&d)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订版本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Re&vert changes</source> <translation type="unfinished">还原改变(&v)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">还原所有改变到本地项目中</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> <source>Mer&ge changes...</source> <translation type="unfinished">合并更改(&g)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> <source>&Tag in repository...</source> <translation>在仓库中标记(&T)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag the local project in the repository</source> <translation>在仓库中标记本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>列出标签…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches...</source> <translation>列出分支…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create branch</source> <translation>创建分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Create &branch...</source> <translation>创建分支(&B)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanu&p</source> <translation type="unfinished">清除(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup the local project</source> <translation type="unfinished">清除本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute command</source> <translation type="unfinished">执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>E&xecute command...</source> <translation>执行命令(&X)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1790"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1317"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Specials</source> <translation type="unfinished">特殊</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1605"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1607"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1846"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Conflicts resolved</source> <translation type="unfinished">冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Con&flicts resolved</source> <translation type="unfinished">冲突已解决(&F)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Add...</source> <translation type="unfinished">添加…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show differences</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> <source>Show differences (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1341"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29545,6 +29779,117 @@ </message> </context> <context> + <name>Histedit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="77"/> + <source>Starting histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="112"/> + <source>Continue histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> + <source>Abort histedit session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="183"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HisteditProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="36"/> + <source>Start</source> + <translation type="unfinished">开始</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="41"/> + <source>Start a new changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="44"/> + <source><b>Start</b><p>This starts a new history editing session. A dialog will be presented to modify the edit plan.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="52"/> + <source>Continue</source> + <translation type="unfinished">继续</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="56"/> + <source>Continue an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="59"/> + <source><b>Continue</b><p>This continues an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="66"/> + <source>Abort</source> + <translation type="unfinished">终止</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="70"/> + <source>Abort an interrupted changeset history editing session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="73"/> + <source><b>Abort</b><p>This aborts an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>Edit Plan</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="84"/> + <source>Edit the remaining actions list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="87"/> + <source><b>Edit Plan</b><p>This opens an editor to edit the remaining actions list of an interrupted history editing session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="123"/> + <source>Edit History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <source>Start History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="178"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> + <source>Continue History Editing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="162"/> + <source>Abort History Editing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../WebBrowser/History/HistoryDialog.ui" line="14"/> @@ -63217,167 +63562,167 @@ <context> <name>Variable Types</name> <message> - <location filename="../Debugger/Config.py" line="16"/> + <location filename="../Debugger/Config.py" line="18"/> <source>Hidden Attributes</source> <translation>隐藏的属性</translation> </message> <message> - <location filename="../Debugger/Config.py" line="17"/> - <source>None</source> - <translation>无</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="18"/> - <source>Type</source> - <translation>类型</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="19"/> - <source>Boolean</source> - <translation>布尔类型</translation> + <source>None</source> + <translation>无</translation> </message> <message> <location filename="../Debugger/Config.py" line="20"/> - <source>Integer</source> - <translation>整型</translation> + <source>Type</source> + <translation>类型</translation> </message> <message> <location filename="../Debugger/Config.py" line="21"/> - <source>Long Integer</source> - <translation>长整型</translation> + <source>Boolean</source> + <translation>布尔类型</translation> </message> <message> <location filename="../Debugger/Config.py" line="22"/> - <source>Float</source> - <translation>浮点型</translation> + <source>Integer</source> + <translation>整型</translation> </message> <message> <location filename="../Debugger/Config.py" line="23"/> - <source>Complex</source> - <translation>复数类型</translation> + <source>Long Integer</source> + <translation>长整型</translation> </message> <message> <location filename="../Debugger/Config.py" line="24"/> - <source>String</source> - <translation>字符串</translation> + <source>Float</source> + <translation>浮点型</translation> </message> <message> <location filename="../Debugger/Config.py" line="25"/> - <source>Unicode String</source> - <translation>Unicode 字符串</translation> + <source>Complex</source> + <translation>复数类型</translation> </message> <message> <location filename="../Debugger/Config.py" line="26"/> - <source>Tuple</source> - <translation>元组（Tuple）</translation> + <source>String</source> + <translation>字符串</translation> </message> <message> <location filename="../Debugger/Config.py" line="27"/> - <source>List/Array</source> - <translation>列表/数组（List/Array）</translation> + <source>Unicode String</source> + <translation>Unicode 字符串</translation> </message> <message> <location filename="../Debugger/Config.py" line="28"/> - <source>Dictionary/Hash/Map</source> - <translation>字典/散列/映射（Dictionary/Hash/Map）</translation> + <source>Tuple</source> + <translation>元组（Tuple）</translation> </message> <message> <location filename="../Debugger/Config.py" line="29"/> + <source>List/Array</source> + <translation>列表/数组（List/Array）</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="30"/> + <source>Dictionary/Hash/Map</source> + <translation>字典/散列/映射（Dictionary/Hash/Map）</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="31"/> <source>Dictionary Proxy</source> <translation>字典代理（Dictionary Proxy）</translation> </message> <message> - <location filename="../Debugger/Config.py" line="32"/> - <source>File</source> - <translation>文件</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="33"/> - <source>X Range</source> - <translation>X 范围</translation> - </message> - <message> <location filename="../Debugger/Config.py" line="34"/> - <source>Slice</source> - <translation>切片（Slice）</translation> + <source>File</source> + <translation>文件</translation> </message> <message> <location filename="../Debugger/Config.py" line="35"/> - <source>Buffer</source> - <translation>缓冲</translation> + <source>X Range</source> + <translation>X 范围</translation> </message> <message> <location filename="../Debugger/Config.py" line="36"/> - <source>Class</source> - <translation>类</translation> + <source>Slice</source> + <translation>切片（Slice）</translation> </message> <message> <location filename="../Debugger/Config.py" line="37"/> - <source>Class Instance</source> - <translation>类实例</translation> + <source>Buffer</source> + <translation>缓冲</translation> </message> <message> <location filename="../Debugger/Config.py" line="38"/> - <source>Class Method</source> - <translation>类方法</translation> + <source>Class</source> + <translation>类</translation> </message> <message> <location filename="../Debugger/Config.py" line="39"/> - <source>Class Property</source> - <translation>类属性</translation> + <source>Class Instance</source> + <translation>类实例</translation> </message> <message> <location filename="../Debugger/Config.py" line="40"/> - <source>Generator</source> - <translation>生成器</translation> + <source>Class Method</source> + <translation>类方法</translation> </message> <message> <location filename="../Debugger/Config.py" line="41"/> - <source>Function</source> - <translation>函数</translation> + <source>Class Property</source> + <translation>类属性</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="42"/> + <source>Generator</source> + <translation>生成器</translation> </message> <message> <location filename="../Debugger/Config.py" line="43"/> - <source>Builtin Function</source> - <translation>内建函数</translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="44"/> - <source>Code</source> - <translation>代码</translation> + <source>Function</source> + <translation>函数</translation> </message> <message> <location filename="../Debugger/Config.py" line="45"/> - <source>Module</source> - <translation>模块</translation> + <source>Builtin Function</source> + <translation>内建函数</translation> </message> <message> <location filename="../Debugger/Config.py" line="46"/> - <source>Ellipsis</source> - <translation>省略号</translation> + <source>Code</source> + <translation>代码</translation> </message> <message> <location filename="../Debugger/Config.py" line="47"/> - <source>Traceback</source> - <translation>追踪</translation> + <source>Module</source> + <translation>模块</translation> </message> <message> <location filename="../Debugger/Config.py" line="48"/> - <source>Frame</source> - <translation>框架</translation> + <source>Ellipsis</source> + <translation>省略号</translation> </message> <message> <location filename="../Debugger/Config.py" line="49"/> + <source>Traceback</source> + <translation>追踪</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="50"/> + <source>Frame</source> + <translation>框架</translation> + </message> + <message> + <location filename="../Debugger/Config.py" line="51"/> <source>Other</source> <translation>其它</translation> </message> <message> - <location filename="../Debugger/Config.py" line="30"/> + <location filename="../Debugger/Config.py" line="32"/> <source>Set</source> <translation>集合</translation> </message> <message> - <location filename="../Debugger/Config.py" line="31"/> + <location filename="../Debugger/Config.py" line="33"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message> @@ -71405,46 +71750,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> <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="2160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <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="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="1498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> <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="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <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="2155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> <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="2175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <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> @@ -71452,12 +71797,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <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="1536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71468,13 +71813,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="2147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
