Mercurial Repositories > eric / changeset
changeset
Added support for various Mercurial 'resolve' subcommands.
Sat, 17 May 2014 18:18:06 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 17 May 2014 18:18:06 +0200
- changeset 3586
- 6e3a6c5b58bf
- parent 3585
- f09a457c83fe
- child 3587
- e2f10b5fd032
Added support for various Mercurial 'resolve' subcommands.
--- a/APIs/Python3/eric5.api Sat May 17 16:53:00 2014 +0200 +++ b/APIs/Python3/eric5.api Sat May 17 18:18:06 2014 +0200 @@ -4558,6 +4558,23 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemDoubleClicked?4(item, column) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemSelectionChanged?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_editButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_reMergeButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_refreshButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_resolvedButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_unresolvedButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.show?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.start?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetEdit_textChanged?4(txt) @@ -5032,6 +5049,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgConflicts?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name, withLargefiles=True, largefilesData=None) @@ -5056,9 +5074,10 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRemoveSubrepositories?4() -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolved?4(name, unresolve=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRevert?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRollback?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSbsDiff?4(name, extended=False, revisions=None)
--- a/APIs/Python3/eric5.bas Sat May 17 16:53:00 2014 +0200 +++ b/APIs/Python3/eric5.bas Sat May 17 18:18:06 2014 +0200 @@ -299,6 +299,7 @@ HgClientPromptDialog QDialog Ui_HgClientPromptDialog HgCommandDialog QDialog Ui_HgCommandDialog HgCommitDialog QWidget Ui_HgCommitDialog +HgConflictsListDialog QWidget Ui_HgConflictsListDialog HgCopyDialog QDialog Ui_HgCopyDialog HgDialog QDialog Ui_HgDialog HgDiffDialog QWidget Ui_HgDiffDialog
--- a/Documentation/Help/source.qhp Sat May 17 16:53:00 2014 +0200 +++ b/Documentation/Help/source.qhp Sat May 17 18:18:06 2014 +0200 @@ -563,6 +563,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html" /> @@ -5613,6 +5614,7 @@ <keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" /> <keyword name="Hg.hgBundle" id="Hg.hgBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBundle" /> <keyword name="Hg.hgCancelMerge" id="Hg.hgCancelMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCancelMerge" /> + <keyword name="Hg.hgConflicts" id="Hg.hgConflicts" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgConflicts" /> <keyword name="Hg.hgCopy" id="Hg.hgCopy" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCopy" /> <keyword name="Hg.hgCreateIgnoreFile" id="Hg.hgCreateIgnoreFile" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCreateIgnoreFile" /> <keyword name="Hg.hgEditConfig" id="Hg.hgEditConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditConfig" /> @@ -5637,9 +5639,10 @@ <keyword name="Hg.hgPreviewBundle" id="Hg.hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPreviewBundle" /> <keyword name="Hg.hgPull" id="Hg.hgPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPull" /> <keyword name="Hg.hgPush" id="Hg.hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPush" /> + <keyword name="Hg.hgReMerge" id="Hg.hgReMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgReMerge" /> <keyword name="Hg.hgRecover" id="Hg.hgRecover" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRecover" /> <keyword name="Hg.hgRemoveSubrepositories" id="Hg.hgRemoveSubrepositories" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRemoveSubrepositories" /> - <keyword name="Hg.hgResolve" id="Hg.hgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgResolve" /> + <keyword name="Hg.hgResolved" id="Hg.hgResolved" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgResolved" /> <keyword name="Hg.hgRevert" id="Hg.hgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRevert" /> <keyword name="Hg.hgRollback" id="Hg.hgRollback" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRollback" /> <keyword name="Hg.hgSbsDiff" id="Hg.hgSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgSbsDiff" /> @@ -5850,6 +5853,34 @@ <keyword name="HgCommitDialog.on_buttonBox_rejected" id="HgCommitDialog.on_buttonBox_rejected" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.on_buttonBox_rejected" /> <keyword name="HgCommitDialog.on_recentComboBox_activated" id="HgCommitDialog.on_recentComboBox_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.on_recentComboBox_activated" /> <keyword name="HgCommitDialog.showEvent" id="HgCommitDialog.showEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html#HgCommitDialog.showEvent" /> + <keyword name="HgConflictsListDialog" id="HgConflictsListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog" /> + <keyword name="HgConflictsListDialog (Constructor)" id="HgConflictsListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__init__" /> + <keyword name="HgConflictsListDialog (Module)" id="HgConflictsListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html" /> + <keyword name="HgConflictsListDialog.__finish" id="HgConflictsListDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__finish" /> + <keyword name="HgConflictsListDialog.__generateItem" id="HgConflictsListDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__generateItem" /> + <keyword name="HgConflictsListDialog.__getEntries" id="HgConflictsListDialog.__getEntries" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__getEntries" /> + <keyword name="HgConflictsListDialog.__procFinished" id="HgConflictsListDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__procFinished" /> + <keyword name="HgConflictsListDialog.__processOutputLine" id="HgConflictsListDialog.__processOutputLine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__processOutputLine" /> + <keyword name="HgConflictsListDialog.__readStderr" id="HgConflictsListDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__readStderr" /> + <keyword name="HgConflictsListDialog.__readStdout" id="HgConflictsListDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__readStdout" /> + <keyword name="HgConflictsListDialog.__resizeColumns" id="HgConflictsListDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__resizeColumns" /> + <keyword name="HgConflictsListDialog.__resort" id="HgConflictsListDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__resort" /> + <keyword name="HgConflictsListDialog.__showError" id="HgConflictsListDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.__showError" /> + <keyword name="HgConflictsListDialog.closeEvent" id="HgConflictsListDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.closeEvent" /> + <keyword name="HgConflictsListDialog.keyPressEvent" id="HgConflictsListDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.keyPressEvent" /> + <keyword name="HgConflictsListDialog.on_buttonBox_clicked" id="HgConflictsListDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_buttonBox_clicked" /> + <keyword name="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" id="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_conflictsList_itemDoubleClicked" /> + <keyword name="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" id="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_conflictsList_itemSelectionChanged" /> + <keyword name="HgConflictsListDialog.on_editButton_clicked" id="HgConflictsListDialog.on_editButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_editButton_clicked" /> + <keyword name="HgConflictsListDialog.on_input_returnPressed" id="HgConflictsListDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_input_returnPressed" /> + <keyword name="HgConflictsListDialog.on_passwordCheckBox_toggled" id="HgConflictsListDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgConflictsListDialog.on_reMergeButton_clicked" id="HgConflictsListDialog.on_reMergeButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_reMergeButton_clicked" /> + <keyword name="HgConflictsListDialog.on_refreshButton_clicked" id="HgConflictsListDialog.on_refreshButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_refreshButton_clicked" /> + <keyword name="HgConflictsListDialog.on_resolvedButton_clicked" id="HgConflictsListDialog.on_resolvedButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_resolvedButton_clicked" /> + <keyword name="HgConflictsListDialog.on_sendButton_clicked" id="HgConflictsListDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_sendButton_clicked" /> + <keyword name="HgConflictsListDialog.on_unresolvedButton_clicked" id="HgConflictsListDialog.on_unresolvedButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.on_unresolvedButton_clicked" /> + <keyword name="HgConflictsListDialog.show" id="HgConflictsListDialog.show" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.show" /> + <keyword name="HgConflictsListDialog.start" id="HgConflictsListDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html#HgConflictsListDialog.start" /> <keyword name="HgCopyDialog" id="HgCopyDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html#HgCopyDialog" /> <keyword name="HgCopyDialog (Constructor)" id="HgCopyDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html#HgCopyDialog.__init__" /> <keyword name="HgCopyDialog (Module)" id="HgCopyDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html" /> @@ -6111,10 +6142,12 @@ <keyword name="HgProjectBrowserHelper.__HgExtendedDiff" id="HgProjectBrowserHelper.__HgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgExtendedDiff" /> <keyword name="HgProjectBrowserHelper.__HgForget" id="HgProjectBrowserHelper.__HgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgForget" /> <keyword name="HgProjectBrowserHelper.__HgMove" id="HgProjectBrowserHelper.__HgMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgMove" /> - <keyword name="HgProjectBrowserHelper.__HgResolve" id="HgProjectBrowserHelper.__HgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolve" /> + <keyword name="HgProjectBrowserHelper.__HgReMerge" id="HgProjectBrowserHelper.__HgReMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgReMerge" /> + <keyword name="HgProjectBrowserHelper.__HgResolved" id="HgProjectBrowserHelper.__HgResolved" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolved" /> <keyword name="HgProjectBrowserHelper.__HgRevert" id="HgProjectBrowserHelper.__HgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgRevert" /> <keyword name="HgProjectBrowserHelper.__HgSbsDiff" id="HgProjectBrowserHelper.__HgSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsDiff" /> <keyword name="HgProjectBrowserHelper.__HgSbsExtendedDiff" id="HgProjectBrowserHelper.__HgSbsExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsExtendedDiff" /> + <keyword name="HgProjectBrowserHelper.__HgUnresolved" id="HgProjectBrowserHelper.__HgUnresolved" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgUnresolved" /> <keyword name="HgProjectBrowserHelper.__addExtensionsMenu" id="HgProjectBrowserHelper.__addExtensionsMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__addExtensionsMenu" /> <keyword name="HgProjectBrowserHelper.__showExtensionMenu" id="HgProjectBrowserHelper.__showExtensionMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__showExtensionMenu" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> @@ -6170,19 +6203,22 @@ <keyword name="HgProjectHelper.__hgPush" id="HgProjectHelper.__hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPush" /> <keyword name="HgProjectHelper.__hgPushForced" id="HgProjectHelper.__hgPushForced" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPushForced" /> <keyword name="HgProjectHelper.__hgPushNewBranch" id="HgProjectHelper.__hgPushNewBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPushNewBranch" /> + <keyword name="HgProjectHelper.__hgReMerge" id="HgProjectHelper.__hgReMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgReMerge" /> <keyword name="HgProjectHelper.__hgRecover" id="HgProjectHelper.__hgRecover" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRecover" /> <keyword name="HgProjectHelper.__hgRemoveSubrepositories" id="HgProjectHelper.__hgRemoveSubrepositories" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRemoveSubrepositories" /> - <keyword name="HgProjectHelper.__hgResolve" id="HgProjectHelper.__hgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgResolve" /> + <keyword name="HgProjectHelper.__hgResolved" id="HgProjectHelper.__hgResolved" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgResolved" /> <keyword name="HgProjectHelper.__hgRevert" id="HgProjectHelper.__hgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRevert" /> <keyword name="HgProjectHelper.__hgRollback" id="HgProjectHelper.__hgRollback" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRollback" /> <keyword name="HgProjectHelper.__hgServe" id="HgProjectHelper.__hgServe" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgServe" /> <keyword name="HgProjectHelper.__hgShowBranch" id="HgProjectHelper.__hgShowBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowBranch" /> <keyword name="HgProjectHelper.__hgShowConfig" id="HgProjectHelper.__hgShowConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowConfig" /> + <keyword name="HgProjectHelper.__hgShowConflicts" id="HgProjectHelper.__hgShowConflicts" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowConflicts" /> <keyword name="HgProjectHelper.__hgShowPaths" id="HgProjectHelper.__hgShowPaths" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowPaths" /> <keyword name="HgProjectHelper.__hgSummary" id="HgProjectHelper.__hgSummary" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgSummary" /> <keyword name="HgProjectHelper.__hgTagList" id="HgProjectHelper.__hgTagList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgTagList" /> <keyword name="HgProjectHelper.__hgTip" id="HgProjectHelper.__hgTip" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgTip" /> <keyword name="HgProjectHelper.__hgUnbundle" id="HgProjectHelper.__hgUnbundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgUnbundle" /> + <keyword name="HgProjectHelper.__hgUnresolved" id="HgProjectHelper.__hgUnresolved" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgUnresolved" /> <keyword name="HgProjectHelper.__hgVerify" id="HgProjectHelper.__hgVerify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgVerify" /> <keyword name="HgProjectHelper.__showExtensionMenu" id="HgProjectHelper.__showExtensionMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__showExtensionMenu" /> <keyword name="HgProjectHelper.getActions" id="HgProjectHelper.getActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.getActions" /> @@ -13861,6 +13897,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Sat May 17 18:18:06 2014 +0200 @@ -0,0 +1,344 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</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>eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog</h1> +<p> +Module implementing a dialog to show a list of files which had or still have +conflicts. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgConflictsListDialog">HgConflictsListDialog</a></td> +<td>Class implementing a dialog to show a list of files which had or still have conflicts.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgConflictsListDialog" ID="HgConflictsListDialog"></a> +<h2>HgConflictsListDialog</h2> +<p> + Class implementing a dialog to show a list of files which had or still + have conflicts. +</p> +<h3>Derived from</h3> +QWidget, Ui_HgConflictsListDialog +<h3>Class Attributes</h3> +<table> +<tr><td>StatusRole</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgConflictsListDialog.__init__">HgConflictsListDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a tag item in the tag list.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td> +<td>Private method to get the conflict entries.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> +<td>Private method to process the lines of output.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> +<td>Private slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> +<td>Private slot called by a button of the button box clicked.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td> +<td>Private slot to open the double clicked entry.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_conflictsList_itemSelectionChanged">on_conflictsList_itemSelectionChanged</a></td> +<td>Private slot to handle a change of selected conflict entries.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td> +<td>Private slot to open the selected file in an editor.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td> +<td>Private slot to handle the press of the return key in the input field.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> +<td>Private slot to re-merge the selected entries.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the log.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td> +<td>Private slot to mark the selected entries as resolved.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> +<td>Private slot to mark the selected entries as unresolved.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr><tr> +<td><a href="#HgConflictsListDialog.start">start</a></td> +<td>Public slot to start the tags command.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgConflictsListDialog.__init__" ID="HgConflictsListDialog.__init__"></a> +<h4>HgConflictsListDialog (Constructor)</h4> +<b>HgConflictsListDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> +<h4>HgConflictsListDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p><a NAME="HgConflictsListDialog.__generateItem" ID="HgConflictsListDialog.__generateItem"></a> +<h4>HgConflictsListDialog.__generateItem</h4> +<b>__generateItem</b>(<i>status, name</i>) +<p> + Private method to generate a tag item in the tag list. +</p><dl> +<dt><i>status</i></dt> +<dd> +status of the file (string) +</dd><dt><i>name</i></dt> +<dd> +name of the file (string) +</dd> +</dl><a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> +<h4>HgConflictsListDialog.__getEntries</h4> +<b>__getEntries</b>(<i></i>) +<p> + Private method to get the conflict entries. +</p><a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a> +<h4>HgConflictsListDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> +<h4>HgConflictsListDialog.__processOutputLine</h4> +<b>__processOutputLine</b>(<i>line</i>) +<p> + Private method to process the lines of output. +</p><dl> +<dt><i>line</i></dt> +<dd> +output line to be processed (string) +</dd> +</dl><a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a> +<h4>HgConflictsListDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a> +<h4>HgConflictsListDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> +<h4>HgConflictsListDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="HgConflictsListDialog.__resort" ID="HgConflictsListDialog.__resort"></a> +<h4>HgConflictsListDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="HgConflictsListDialog.__showError" ID="HgConflictsListDialog.__showError"></a> +<h4>HgConflictsListDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p><dl> +<dt><i>out</i></dt> +<dd> +error to be shown (string) +</dd> +</dl><a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> +<h4>HgConflictsListDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Private slot implementing a close event handler. +</p><dl> +<dt><i>e</i></dt> +<dd> +close event (QCloseEvent) +</dd> +</dl><a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a> +<h4>HgConflictsListDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> +<h4>HgConflictsListDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p><dl> +<dt><i>button</i></dt> +<dd> +button that was clicked (QAbstractButton) +</dd> +</dl><a NAME="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> +<h4>HgConflictsListDialog.on_conflictsList_itemDoubleClicked</h4> +<b>on_conflictsList_itemDoubleClicked</b>(<i>item, column</i>) +<p> + Private slot to open the double clicked entry. +</p><a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a> +<h4>HgConflictsListDialog.on_conflictsList_itemSelectionChanged</h4> +<b>on_conflictsList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to handle a change of selected conflict entries. +</p><a NAME="HgConflictsListDialog.on_editButton_clicked" ID="HgConflictsListDialog.on_editButton_clicked"></a> +<h4>HgConflictsListDialog.on_editButton_clicked</h4> +<b>on_editButton_clicked</b>(<i></i>) +<p> + Private slot to open the selected file in an editor. +</p><a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a> +<h4>HgConflictsListDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a> +<h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> +<h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> +<b>on_reMergeButton_clicked</b>(<i></i>) +<p> + Private slot to re-merge the selected entries. +</p><a NAME="HgConflictsListDialog.on_refreshButton_clicked" ID="HgConflictsListDialog.on_refreshButton_clicked"></a> +<h4>HgConflictsListDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the log. +</p><a NAME="HgConflictsListDialog.on_resolvedButton_clicked" ID="HgConflictsListDialog.on_resolvedButton_clicked"></a> +<h4>HgConflictsListDialog.on_resolvedButton_clicked</h4> +<b>on_resolvedButton_clicked</b>(<i></i>) +<p> + Private slot to mark the selected entries as resolved. +</p><a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a> +<h4>HgConflictsListDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> +<h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> +<b>on_unresolvedButton_clicked</b>(<i></i>) +<p> + Private slot to mark the selected entries as unresolved. +</p><a NAME="HgConflictsListDialog.show" ID="HgConflictsListDialog.show"></a> +<h4>HgConflictsListDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p><a NAME="HgConflictsListDialog.start" ID="HgConflictsListDialog.start"></a> +<h4>HgConflictsListDialog.start</h4> +<b>start</b>(<i>path</i>) +<p> + Public slot to start the tags command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to list conflicts for (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sat May 17 16:53:00 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sat May 17 18:18:06 2014 +0200 @@ -75,8 +75,11 @@ <td><a href="#HgProjectBrowserHelper.__HgMove">__HgMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> -<td><a href="#HgProjectBrowserHelper.__HgResolve">__HgResolve</a></td> -<td>Private slot called by the context menu to resolve conflicts of a file.</td> +<td><a href="#HgProjectBrowserHelper.__HgReMerge">__HgReMerge</a></td> +<td>Private slot called by the context menu to re-merge a file.</td> +</tr><tr> +<td><a href="#HgProjectBrowserHelper.__HgResolved">__HgResolved</a></td> +<td>Private slot called by the context menu to mark conflicts of a file as being resolved.</td> </tr><tr> <td><a href="#HgProjectBrowserHelper.__HgRevert">__HgRevert</a></td> <td>Protected slot called by the context menu to revert changes made.</td> @@ -87,6 +90,9 @@ <td><a href="#HgProjectBrowserHelper.__HgSbsExtendedDiff">__HgSbsExtendedDiff</a></td> <td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> </tr><tr> +<td><a href="#HgProjectBrowserHelper.__HgUnresolved">__HgUnresolved</a></td> +<td>Private slot called by the context menu to mark conflicts of a file as being unresolved.</td> +</tr><tr> <td><a href="#HgProjectBrowserHelper.__addExtensionsMenu">__addExtensionsMenu</a></td> <td>Private method to add an extension menu entry.</td> </tr><tr> @@ -181,11 +187,17 @@ <b>__HgMove</b>(<i></i>) <p> Private slot called by the context menu to move the selected file. -</p><a NAME="HgProjectBrowserHelper.__HgResolve" ID="HgProjectBrowserHelper.__HgResolve"></a> -<h4>HgProjectBrowserHelper.__HgResolve</h4> -<b>__HgResolve</b>(<i></i>) +</p><a NAME="HgProjectBrowserHelper.__HgReMerge" ID="HgProjectBrowserHelper.__HgReMerge"></a> +<h4>HgProjectBrowserHelper.__HgReMerge</h4> +<b>__HgReMerge</b>(<i></i>) <p> - Private slot called by the context menu to resolve conflicts of a file. + Private slot called by the context menu to re-merge a file. +</p><a NAME="HgProjectBrowserHelper.__HgResolved" ID="HgProjectBrowserHelper.__HgResolved"></a> +<h4>HgProjectBrowserHelper.__HgResolved</h4> +<b>__HgResolved</b>(<i></i>) +<p> + Private slot called by the context menu to mark conflicts of a file + as being resolved. </p><a NAME="HgProjectBrowserHelper.__HgRevert" ID="HgProjectBrowserHelper.__HgRevert"></a> <h4>HgProjectBrowserHelper.__HgRevert</h4> <b>__HgRevert</b>(<i></i>) @@ -205,6 +217,12 @@ file to the repository side-by-side. </p><p> It allows the selection of revisions to compare. +</p><a NAME="HgProjectBrowserHelper.__HgUnresolved" ID="HgProjectBrowserHelper.__HgUnresolved"></a> +<h4>HgProjectBrowserHelper.__HgUnresolved</h4> +<b>__HgUnresolved</b>(<i></i>) +<p> + Private slot called by the context menu to mark conflicts of a file + as being unresolved. </p><a NAME="HgProjectBrowserHelper.__addExtensionsMenu" ID="HgProjectBrowserHelper.__addExtensionsMenu"></a> <h4>HgProjectBrowserHelper.__addExtensionsMenu</h4> <b>__addExtensionsMenu</b>(<i>menu, key</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sat May 17 16:53:00 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sat May 17 18:18:06 2014 +0200 @@ -186,14 +186,17 @@ <td><a href="#HgProjectHelper.__hgPushNewBranch">__hgPushNewBranch</a></td> <td>Private slot to push a new named branch.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgReMerge">__hgReMerge</a></td> +<td>Private slot used to list all files with conflicts.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgRecover">__hgRecover</a></td> <td>Private slot used to recover from an interrupted transaction.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgRemoveSubrepositories">__hgRemoveSubrepositories</a></td> <td>Private slot used to remove sub-repositories.</td> </tr><tr> -<td><a href="#HgProjectHelper.__hgResolve">__hgResolve</a></td> -<td>Private slot used to resolve conflicts of the local project.</td> +<td><a href="#HgProjectHelper.__hgResolved">__hgResolved</a></td> +<td>Private slot used to mark conflicts of the local project as being resolved.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgRevert">__hgRevert</a></td> <td>Private slot used to revert changes made to the local project.</td> @@ -210,6 +213,9 @@ <td><a href="#HgProjectHelper.__hgShowConfig">__hgShowConfig</a></td> <td>Private slot used to show the combined configuration.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgShowConflicts">__hgShowConflicts</a></td> +<td>Private slot used to list all files with conflicts.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgShowPaths">__hgShowPaths</a></td> <td>Private slot used to show the aliases for remote repositories.</td> </tr><tr> @@ -225,6 +231,9 @@ <td><a href="#HgProjectHelper.__hgUnbundle">__hgUnbundle</a></td> <td>Private slot used to apply changegroup files.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgUnresolved">__hgUnresolved</a></td> +<td>Private slot used to mark conflicts of the local project as being unresolved.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgVerify">__hgVerify</a></td> <td>Private slot used to verify the integrity of the repository.</td> </tr><tr> @@ -490,6 +499,11 @@ <b>__hgPushNewBranch</b>(<i></i>) <p> Private slot to push a new named branch. +</p><a NAME="HgProjectHelper.__hgReMerge" ID="HgProjectHelper.__hgReMerge"></a> +<h4>HgProjectHelper.__hgReMerge</h4> +<b>__hgReMerge</b>(<i></i>) +<p> + Private slot used to list all files with conflicts. </p><a NAME="HgProjectHelper.__hgRecover" ID="HgProjectHelper.__hgRecover"></a> <h4>HgProjectHelper.__hgRecover</h4> <b>__hgRecover</b>(<i></i>) @@ -500,11 +514,12 @@ <b>__hgRemoveSubrepositories</b>(<i></i>) <p> Private slot used to remove sub-repositories. -</p><a NAME="HgProjectHelper.__hgResolve" ID="HgProjectHelper.__hgResolve"></a> -<h4>HgProjectHelper.__hgResolve</h4> -<b>__hgResolve</b>(<i></i>) +</p><a NAME="HgProjectHelper.__hgResolved" ID="HgProjectHelper.__hgResolved"></a> +<h4>HgProjectHelper.__hgResolved</h4> +<b>__hgResolved</b>(<i></i>) <p> - Private slot used to resolve conflicts of the local project. + Private slot used to mark conflicts of the local project as being + resolved. </p><a NAME="HgProjectHelper.__hgRevert" ID="HgProjectHelper.__hgRevert"></a> <h4>HgProjectHelper.__hgRevert</h4> <b>__hgRevert</b>(<i></i>) @@ -530,6 +545,11 @@ <b>__hgShowConfig</b>(<i></i>) <p> Private slot used to show the combined configuration. +</p><a NAME="HgProjectHelper.__hgShowConflicts" ID="HgProjectHelper.__hgShowConflicts"></a> +<h4>HgProjectHelper.__hgShowConflicts</h4> +<b>__hgShowConflicts</b>(<i></i>) +<p> + Private slot used to list all files with conflicts. </p><a NAME="HgProjectHelper.__hgShowPaths" ID="HgProjectHelper.__hgShowPaths"></a> <h4>HgProjectHelper.__hgShowPaths</h4> <b>__hgShowPaths</b>(<i></i>) @@ -555,6 +575,12 @@ <b>__hgUnbundle</b>(<i></i>) <p> Private slot used to apply changegroup files. +</p><a NAME="HgProjectHelper.__hgUnresolved" ID="HgProjectHelper.__hgUnresolved"></a> +<h4>HgProjectHelper.__hgUnresolved</h4> +<b>__hgUnresolved</b>(<i></i>) +<p> + Private slot used to mark conflicts of the local project as being + unresolved. </p><a NAME="HgProjectHelper.__hgVerify" ID="HgProjectHelper.__hgVerify"></a> <h4>HgProjectHelper.__hgVerify</h4> <b>__hgVerify</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sat May 17 16:53:00 2014 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sat May 17 18:18:06 2014 +0200 @@ -176,6 +176,9 @@ <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> <td>Public method to cancel an uncommitted merge.</td> </tr><tr> +<td><a href="#Hg.hgConflicts">hgConflicts</a></td> +<td>Public method used to show a list of files containing.</td> +</tr><tr> <td><a href="#Hg.hgCopy">hgCopy</a></td> <td>Public method used to copy a file/directory.</td> </tr><tr> @@ -248,13 +251,16 @@ <td><a href="#Hg.hgPush">hgPush</a></td> <td>Public method used to push changes to a remote Mercurial repository.</td> </tr><tr> +<td><a href="#Hg.hgReMerge">hgReMerge</a></td> +<td>Public method used to merge a URL/revision into the local project.</td> +</tr><tr> <td><a href="#Hg.hgRecover">hgRecover</a></td> <td>Public method to recover an interrupted transaction.</td> </tr><tr> <td><a href="#Hg.hgRemoveSubrepositories">hgRemoveSubrepositories</a></td> <td>Public method to remove sub-repositories.</td> </tr><tr> -<td><a href="#Hg.hgResolve">hgResolve</a></td> +<td><a href="#Hg.hgResolved">hgResolved</a></td> <td>Public method used to resolve conflicts of a file/directory.</td> </tr><tr> <td><a href="#Hg.hgRevert">hgRevert</a></td> @@ -779,6 +785,16 @@ flag indicating, that the cancellation contained an add or delete (boolean) </dd> +</dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> +<h4>Hg.hgConflicts</h4> +<b>hgConflicts</b>(<i>name</i>) +<p> + Public method used to show a list of files containing. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be resolved (string) +</dd> </dl><a NAME="Hg.hgCopy" ID="Hg.hgCopy"></a> <h4>Hg.hgCopy</h4> <b>hgCopy</b>(<i>name, project</i>) @@ -1131,6 +1147,16 @@ <dd> flag indicating to push a new branch (boolean) </dd> +</dl><a NAME="Hg.hgReMerge" ID="Hg.hgReMerge"></a> +<h4>Hg.hgReMerge</h4> +<b>hgReMerge</b>(<i>name</i>) +<p> + Public method used to merge a URL/revision into the local project. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be merged (string) +</dd> </dl><a NAME="Hg.hgRecover" ID="Hg.hgRecover"></a> <h4>Hg.hgRecover</h4> <b>hgRecover</b>(<i>name</i>) @@ -1146,15 +1172,19 @@ <b>hgRemoveSubrepositories</b>(<i></i>) <p> Public method to remove sub-repositories. -</p><a NAME="Hg.hgResolve" ID="Hg.hgResolve"></a> -<h4>Hg.hgResolve</h4> -<b>hgResolve</b>(<i>name</i>) +</p><a NAME="Hg.hgResolved" ID="Hg.hgResolved"></a> +<h4>Hg.hgResolved</h4> +<b>hgResolved</b>(<i>name, unresolve=False</i>) <p> Public method used to resolve conflicts of a file/directory. </p><dl> <dt><i>name</i></dt> <dd> file/directory name to be resolved (string) +</dd><dt><i>unresolve</i></dt> +<dd> +flag indicating to mark the file/directory as + unresolved (boolean) </dd> </dl><a NAME="Hg.hgRevert" ID="Hg.hgRevert"></a> <h4>Hg.hgRevert</h4>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sat May 17 16:53:00 2014 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sat May 17 18:18:06 2014 +0200 @@ -107,6 +107,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html">HgCommitDialog</a></td> <td>Module implementing a dialog to enter the commit message.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html">HgConflictsListDialog</a></td> +<td>Module implementing a dialog to show a list of files which had or still have conflicts.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html">HgCopyDialog</a></td> <td>Module implementing a dialog to enter the data for a copy or rename operation.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat May 17 18:18:06 2014 +0200 @@ -0,0 +1,442 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to show a list of files which had or still have +conflicts. +""" + +from __future__ import unicode_literals + +import os + +from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt4.QtGui import (QWidget, QAbstractButton, QDialogButtonBox, + QHeaderView, QTreeWidgetItem, QLineEdit, QApplication) + +from E5Gui import E5MessageBox +from E5Gui.E5Application import e5App + +from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog + +import Utilities.mimetypes + + +class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): + """ + Class implementing a dialog to show a list of files which had or still + have conflicts. + """ + StatusRole = Qt.UserRole + 1 + FilenameRole = Qt.UserRole + 2 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @param parent parent widget (QWidget) + """ + super(HgConflictsListDialog, self).__init__(parent) + self.setupUi(self) + + self.__position = QPoint() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.conflictsList.headerItem().setText( + self.conflictsList.columnCount(), "") + self.conflictsList.header().setSortIndicator(0, Qt.AscendingOrder) + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ActionRole) + self.refreshButton.setToolTip( + self.tr("Press to refresh the list of conflicts")) + self.refreshButton.setEnabled(False) + + self.vcs = vcs + self.project = e5App().getObject("Project") + + self.__hgClient = vcs.getClient() + if self.__hgClient: + self.process = None + else: + self.process = QProcess() + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + + def closeEvent(self, e): + """ + Private slot implementing a close event handler. + + @param e close event (QCloseEvent) + """ + if self.__hgClient: + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() + else: + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + self.__position = self.pos() + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + if not self.__position.isNull(): + self.move(self.__position) + + super(HgConflictsListDialog, self).show() + + def start(self, path): + """ + Public slot to start the tags command. + + @param path name of directory to list conflicts for (string) + """ + self.errorGroup.hide() + QApplication.processEvents() + + self.intercept = False + dname, fname = self.vcs.splitPath(path) + + # find the root of the repo + self.__repodir = dname + while not os.path.isdir( + os.path.join(self.__repodir, self.vcs.adminDir)): + self.__repodir = os.path.dirname(self.__repodir) + if os.path.splitdrive(self.__repodir)[1] == os.sep: + return + + self.activateWindow() + self.raise_() + + self.conflictsList.clear() + self.__started = True + self.__getEntries() + + def __getEntries(self): + """ + Private method to get the conflict entries. + """ + args = self.vcs.initCommand("resolve") + args.append('--list') + + if self.__hgClient: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + + out, err = self.__hgClient.runcommand(args) + if err: + self.__showError(err) + if out: + for line in out.splitlines(): + self.__processOutputLine(line) + if self.__hgClient.wasCanceled(): + break + self.__finish() + else: + self.process.kill() + self.process.setWorkingDirectory(self.__repodir) + + self.process.start('hg', args) + procStarted = self.process.waitForStarted(5000) + if not procStarted: + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + E5MessageBox.critical( + self, + self.tr('Process Generation Error'), + self.tr( + 'The process {0} could not be started. ' + 'Ensure, that it is in the search path.' + ).format('hg')) + else: + self.inputGroup.setEnabled(True) + self.inputGroup.show() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + if self.process is not None and \ + self.process.state() != QProcess.NotRunning: + self.process.terminate() + QTimer.singleShot(2000, self.process.kill) + self.process.waitForFinished(3000) + + QApplication.restoreOverrideCursor() + + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + + self.inputGroup.setEnabled(False) + self.inputGroup.hide() + self.refreshButton.setEnabled(True) + + self.__resizeColumns() + self.__resort() + self.on_conflictsList_itemSelectionChanged() + + @pyqtSlot(QAbstractButton) + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked (QAbstractButton) + """ + if button == self.buttonBox.button(QDialogButtonBox.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.Cancel): + if self.__hgClient: + self.__hgClient.cancel() + else: + self.__finish() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + def __procFinished(self, exitCode, exitStatus): + """ + Private slot connected to the finished signal. + + @param exitCode exit code of the process (integer) + @param exitStatus exit status of the process (QProcess.ExitStatus) + """ + self.__finish() + + def __resort(self): + """ + Private method to resort the tree. + """ + self.conflictsList.sortItems( + self.conflictsList.sortColumn(), + self.conflictsList.header().sortIndicatorOrder()) + + def __resizeColumns(self): + """ + Private method to resize the list columns. + """ + self.conflictsList.header().resizeSections( + QHeaderView.ResizeToContents) + self.conflictsList.header().setStretchLastSection(True) + + def __generateItem(self, status, name): + """ + Private method to generate a tag item in the tag list. + + @param status status of the file (string) + @param name name of the file (string) + """ + itm = QTreeWidgetItem(self.conflictsList) + if status == "U": + itm.setText(0, self.tr("Unresolved")) + elif status == "R": + itm.setText(0, self.tr("Resolved")) + else: + itm.setText(0, self.tr("Unknown Status")) + itm.setText(1, name) + + itm.setData(0, self.StatusRole, status) + itm.setData(0, self.FilenameRole, self.project.getAbsolutePath(name)) + + def __readStdout(self): + """ + Private slot to handle the readyReadStdout signal. + + It reads the output of the process, formats it and inserts it into + the contents pane. + """ + self.process.setReadChannel(QProcess.StandardOutput) + + while self.process.canReadLine(): + s = str(self.process.readLine(), self.vcs.getEncoding(), + 'replace').strip() + self.__processOutputLine(s) + + def __processOutputLine(self, line): + """ + Private method to process the lines of output. + + @param line output line to be processed (string) + """ + status, filename = line.strip().split(None, 1) + self.__generateItem(status, filename) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the log. + """ + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + + self.inputGroup.setEnabled(True) + self.inputGroup.show() + self.refreshButton.setEnabled(False) + self.start(self.__repodir) + + def __readStderr(self): + """ + Private slot to handle the readyReadStderr signal. + + It reads the error output of the process and inserts it into the + error pane. + """ + if self.process is not None: + s = str(self.process.readAllStandardError(), + self.vcs.getEncoding(), 'replace') + self.__showError(s) + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown (string) + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + def on_passwordCheckBox_toggled(self, isOn): + """ + Private slot to handle the password checkbox toggled. + + @param isOn flag indicating the status of the check box (boolean) + """ + if isOn: + self.input.setEchoMode(QLineEdit.Password) + else: + self.input.setEchoMode(QLineEdit.Normal) + + @pyqtSlot() + def on_sendButton_clicked(self): + """ + Private slot to send the input to the subversion process. + """ + input = self.input.text() + input += os.linesep + + if self.passwordCheckBox.isChecked(): + self.errors.insertPlainText(os.linesep) + self.errors.ensureCursorVisible() + else: + self.errors.insertPlainText(input) + self.errors.ensureCursorVisible() + + self.process.write(input) + + self.passwordCheckBox.setChecked(False) + self.input.clear() + + def on_input_returnPressed(self): + """ + Private slot to handle the press of the return key in the input field. + """ + self.intercept = True + self.on_sendButton_clicked() + + def keyPressEvent(self, evt): + """ + Protected slot to handle a key press event. + + @param evt the key press event (QKeyEvent) + """ + if self.intercept: + self.intercept = False + evt.accept() + return + super(HgConflictsListDialog, self).keyPressEvent(evt) + + @pyqtSlot(QTreeWidgetItem, int) + def on_conflictsList_itemDoubleClicked(self, item, column): + """ + Private slot to open the double clicked entry. + """ + self.on_editButton_clicked() + + @pyqtSlot() + def on_conflictsList_itemSelectionChanged(self): + """ + Private slot to handle a change of selected conflict entries. + """ + selectedCount = len(self.conflictsList.selectedItems()) + unresolved = resolved = 0 + for itm in self.conflictsList.selectedItems(): + status = itm.data(0, self.StatusRole) + if status == "U": + unresolved += 1 + elif status == "R": + resolved += 1 + + self.resolvedButton.setEnabled(unresolved > 0) + self.unresolvedButton.setEnabled(resolved > 0) + self.reMergeButton.setEnabled(unresolved > 0) + self.editButton.setEnabled( + selectedCount == 1 and + Utilities.mimetypes.isTextFile( + self.conflictsList.selectedItems()[0].data( + 0, self.FilenameRole))) + + @pyqtSlot() + def on_resolvedButton_clicked(self): + """ + Private slot to mark the selected entries as resolved. + """ + names = [ + itm.data(0, self.FilenameRole) + for itm in self.conflictsList.selectedItems() + if itm.data(0, self.StatusRole) == "U" + ] + if names: + self.vcs.hgResolved(names) + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_unresolvedButton_clicked(self): + """ + Private slot to mark the selected entries as unresolved. + """ + names = [ + itm.data(0, self.FilenameRole) + for itm in self.conflictsList.selectedItems() + if itm.data(0, self.StatusRole) == "R" + ] + if names: + self.vcs.hgResolved(names, unresolve=True) + self.on_refreshButton_clicked() + + @pyqtSlot() + def on_reMergeButton_clicked(self): + """ + Private slot to re-merge the selected entries. + """ + names = [ + itm.data(0, self.FilenameRole) + for itm in self.conflictsList.selectedItems() + if itm.data(0, self.StatusRole) == "U" + ] + if names: + self.vcs.hgReMerge(names) + + @pyqtSlot() + def on_editButton_clicked(self): + """ + Private slot to open the selected file in an editor. + """ + itm = self.conflictsList.selectedItems()[0] + filename = itm.data(0, self.FilenameRole) + if Utilities.mimetypes.isTextFile(filename): + e5App().getObject("ViewManager").getEditor(filename)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui Sat May 17 18:18:06 2014 +0200 @@ -0,0 +1,244 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgConflictsListDialog</class> + <widget class="QWidget" name="HgConflictsListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>650</width> + <height>450</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Conflicts</string> + </property> + <property name="sizeGripEnabled" stdset="0"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="conflictsList"> + <property name="whatsThis"> + <string><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></string> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Status</string> + </property> + </column> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="resolvedButton"> + <property name="toolTip"> + <string>Press to mark the selected entries as 'resolved'</string> + </property> + <property name="text"> + <string>Resolved</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="unresolvedButton"> + <property name="toolTip"> + <string>Press to mark the selected entries as 'unresolved'</string> + </property> + <property name="text"> + <string>Unresolved</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="reMergeButton"> + <property name="toolTip"> + <string>Press to re-merge the selected entries</string> + </property> + <property name="text"> + <string>Re-Merge</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="editButton"> + <property name="toolTip"> + <string>Press to edit the selected entry</string> + </property> + <property name="text"> + <string>Edit</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> + <string>Input</string> + </property> + <layout class="QGridLayout" name="_2"> + <item row="1" column="1"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>327</width> + <height>29</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> + <string>Press to send the input to the hg process</string> + </property> + <property name="text"> + <string>&Send</string> + </property> + <property name="shortcut"> + <string>Alt+S</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> + <string>Enter data to be sent to the hg process</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> + <string>Select to switch the input field to password mode</string> + </property> + <property name="text"> + <string>&Password Mode</string> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>conflictsList</tabstop> + <tabstop>resolvedButton</tabstop> + <tabstop>unresolvedButton</tabstop> + <tabstop>reMergeButton</tabstop> + <tabstop>editButton</tabstop> + <tabstop>errors</tabstop> + <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> + <tabstop>sendButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat May 17 16:53:00 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat May 17 18:18:06 2014 +0200 @@ -351,7 +351,13 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) act = menu.addAction( - self.tr('Conflicts resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolved) + self.vcsMenuActions.append(act) + act = menu.addAction( + self.tr('Conflicts unresolved'), self.__HgUnresolved) + self.vcsMenuActions.append(act) + act = menu.addAction( + self.tr('Re-Merge'), self.__HgReMerge) self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -432,7 +438,13 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflicts resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolved) + self.vcsMultiMenuActions.append(act) + act = menu.addAction( + self.tr('Conflicts unresolved'), self.__HgUnresolved) + self.vcsMultiMenuActions.append(act) + act = menu.addAction( + self.tr('Re-Merge'), self.__HgReMerge) self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -556,7 +568,13 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( - self.tr('Conflicts resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolved) + self.vcsDirMenuActions.append(act) + act = menu.addAction( + self.tr('Conflicts unresolved'), self.__HgUnresolved) + self.vcsDirMenuActions.append(act) + act = menu.addAction( + self.tr('Re-Merge'), self.__HgReMerge) self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -634,7 +652,13 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflicts resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolved) + self.vcsDirMultiMenuActions.append(act) + act = menu.addAction( + self.tr('Conflicts unresolved'), self.__HgUnresolved) + self.vcsDirMultiMenuActions.append(act) + act = menu.addAction( + self.tr('Re-Merge'), self.__HgReMerge) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -741,9 +765,10 @@ fn = itm.fileName() self.vcs.hgAnnotate(fn) - def __HgResolve(self): + def __HgResolved(self): """ - Private slot called by the context menu to resolve conflicts of a file. + Private slot called by the context menu to mark conflicts of a file + as being resolved. """ names = [] for itm in self.browser.getSelectedItems(): @@ -751,8 +776,33 @@ names.append(itm.fileName()) except AttributeError: names.append(itm.dirName()) - self.vcs.hgResolve(names) - + self.vcs.hgResolved(names) + + def __HgUnresolved(self): + """ + Private slot called by the context menu to mark conflicts of a file + as being unresolved. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + names.append(itm.fileName()) + except AttributeError: + names.append(itm.dirName()) + self.vcs.hgResolved(names, unresolve=True) + + def __HgReMerge(self): + """ + Private slot called by the context menu to re-merge a file. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + names.append(itm.fileName()) + except AttributeError: + names.append(itm.dirName()) + self.vcs.hgReMerge(names) + def __HgForget(self): """ Private slot called by the context menu to remove the selected file
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat May 17 16:53:00 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat May 17 18:18:06 2014 +0200 @@ -428,6 +428,37 @@ self.hgCancelMergeAct.triggered.connect(self.__hgCancelMerge) self.actions.append(self.hgCancelMergeAct) + self.hgReMergeAct = E5Action( + self.tr('Re-Merge'), + UI.PixmapCache.getIcon("vcsMerge.png"), + self.tr('Re-Merge'), + 0, 0, self, 'mercurial_remerge') + self.hgReMergeAct.setStatusTip(self.tr( + 'Re-Merge all conflicting, unresolved files of the project' + )) + self.hgReMergeAct.setWhatsThis(self.tr( + """<b>Re-Merge</b>""" + """<p>This re-merges all conflicting, unresolved files of the""" + """ project discarding any previous merge attempt.</p>""" + )) + self.hgReMergeAct.triggered.connect(self.__hgReMerge) + self.actions.append(self.hgReMergeAct) + + self.hgShowConflictsAct = E5Action( + self.tr('Show conflicts'), + self.tr('Show conflicts...'), + 0, 0, self, 'mercurial_show_conflicts') + self.hgShowConflictsAct.setStatusTip(self.tr( + 'Show a dialog listing all files with conflicts' + )) + self.hgShowConflictsAct.setWhatsThis(self.tr( + """<b>Show conflicts</b>""" + """<p>This shows a dialog listing all files which had or still""" + """ have conflicts.</p>""" + )) + self.hgShowConflictsAct.triggered.connect(self.__hgShowConflicts) + self.actions.append(self.hgShowConflictsAct) + self.vcsResolveAct = E5Action( self.tr('Conflicts resolved'), self.tr('Con&flicts resolved'), @@ -440,9 +471,24 @@ """<p>This marks all conflicts of the local project as""" """ resolved.</p>""" )) - self.vcsResolveAct.triggered.connect(self.__hgResolve) + self.vcsResolveAct.triggered.connect(self.__hgResolved) self.actions.append(self.vcsResolveAct) + self.hgUnresolveAct = E5Action( + self.tr('Conflicts unresolved'), + self.tr('Conflicts unresolved'), + 0, 0, self, 'mercurial_unresolve') + self.hgUnresolveAct.setStatusTip(self.tr( + 'Mark all conflicts of the local project as unresolved' + )) + self.hgUnresolveAct.setWhatsThis(self.tr( + """<b>Conflicts unresolved</b>""" + """<p>This marks all conflicts of the local project as""" + """ unresolved.</p>""" + )) + self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) + self.actions.append(self.hgUnresolveAct) + self.vcsTagAct = E5Action( self.tr('Tag in repository'), UI.PixmapCache.getIcon("vcsTag.png"), @@ -1278,6 +1324,16 @@ subrepoMenu.addAction(self.hgAddSubrepoAct) subrepoMenu.addAction(self.hgRemoveSubreposAct) + changesMenu = QMenu(self.tr("Manage Changes"), menu) + changesMenu.setTearOffEnabled(True) + changesMenu.addAction(self.vcsRevertAct) + changesMenu.addAction(self.vcsMergeAct) + changesMenu.addAction(self.hgShowConflictsAct) + changesMenu.addAction(self.vcsResolveAct) + changesMenu.addAction(self.hgUnresolveAct) + changesMenu.addAction(self.hgReMergeAct) + changesMenu.addAction(self.hgCancelMergeAct) + act = menu.addAction( UI.PixmapCache.getIcon( os.path.join("VcsPlugins", "vcsMercurial", "icons", @@ -1323,10 +1379,7 @@ if self.vcs.version >= (2, 1): menu.addAction(self.hgPhaseAct) menu.addSeparator() - menu.addAction(self.vcsRevertAct) - menu.addAction(self.vcsMergeAct) - menu.addAction(self.vcsResolveAct) - menu.addAction(self.hgCancelMergeAct) + menu.addMenu(changesMenu) menu.addSeparator() menu.addAction(self.vcsSwitchAct) menu.addSeparator() @@ -1451,11 +1504,19 @@ """ self.vcs.hgInfo(self.project.ppath, mode="tip") - def __hgResolve(self): + def __hgResolved(self): + """ + Private slot used to mark conflicts of the local project as being + resolved. """ - Private slot used to resolve conflicts of the local project. + self.vcs.hgResolved(self.project.ppath) + + def __hgUnresolved(self): """ - self.vcs.hgResolve(self.project.ppath) + Private slot used to mark conflicts of the local project as being + unresolved. + """ + self.vcs.hgResolved(self.project.ppath, unresolve=True) def __hgCancelMerge(self): """ @@ -1463,6 +1524,18 @@ """ self.vcs.hgCancelMerge(self.project.ppath) + def __hgShowConflicts(self): + """ + Private slot used to list all files with conflicts. + """ + self.vcs.hgConflicts(self.project.ppath) + + def __hgReMerge(self): + """ + Private slot used to list all files with conflicts. + """ + self.vcs.hgReMerge(self.project.ppath) + def __hgTagList(self): """ Private slot used to list the tags of the project.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat May 17 16:53:00 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat May 17 18:18:06 2014 +0200 @@ -111,6 +111,7 @@ self.serveDlg = None self.bookmarksListDlg = None self.bookmarksInOutDlg = None + self.conflictsDlg = None self.bundleFile = None self.__lastChangeGroupPath = None @@ -206,6 +207,9 @@ if self.bookmarksInOutDlg is not None: self.bookmarksInOutDlg.close() + if self.conflictsDlg is not None: + self.conflictsDlg.close() + if self.bundleFile and os.path.exists(self.bundleFile): os.remove(self.bundleFile) @@ -1057,6 +1061,57 @@ dia.exec_() self.checkVCSStatus() + def hgReMerge(self, name): + """ + Public method used to merge a URL/revision into the local project. + + @param name file/directory name to be merged (string) + """ + args = self.initCommand("resolve") + if self.getPlugin().getPreferences("InternalMerge"): + args.append("--tool") + args.append("internal:merge") + if isinstance(name, list): + dname, fnames = self.splitPathList(name) + self.addArguments(args, name) + names = name[:] + else: + dname, fname = self.splitPath(name) + args.append(name) + names = [name] + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + project = e5App().getObject("Project") + names = [project.getRelativePath(nam) for nam in names] + if names[0]: + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog + dlg = DeleteFilesConfirmationDialog( + self.parent(), + self.tr("Re-Merge"), + self.tr( + "Do you really want to re-merge these files" + " or directories?"), + names) + yes = dlg.exec_() == QDialog.Accepted + else: + yes = E5MessageBox.yesNo( + None, + self.tr("Re-Merge"), + self.tr("""Do you really want to re-merge the project?""")) + if yes: + dia = HgDialog(self.tr('Re-Merging').format(name), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + self.checkVCSStatus() + def vcsSwitch(self, name): """ Public method used to switch a working directory to a different @@ -2055,15 +2110,31 @@ dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) dlg.exec_() - # TODO: Add support for hg resolve -l displaying a dialog like log - def hgResolve(self, name): + def hgConflicts(self, name): + """ + Public method used to show a list of files containing. + + @param name file/directory name to be resolved (string) + """ + if self.conflictsDlg is None: + from .HgConflictsListDialog import HgConflictsListDialog + self.conflictsDlg = HgConflictsListDialog(self) + self.conflictsDlg.show() + self.conflictsDlg.start(name) + + def hgResolved(self, name, unresolve=False): """ Public method used to resolve conflicts of a file/directory. @param name file/directory name to be resolved (string) + @param unresolve flag indicating to mark the file/directory as + unresolved (boolean) """ args = self.initCommand("resolve") - args.append("--mark") + if unresolve: + args.append("--unmark") + else: + args.append("--mark") if isinstance(name, list): dname, fnames = self.splitPathList(name) @@ -2079,7 +2150,11 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - dia = HgDialog(self.tr('Resolving files/directories'), self) + if unresolve: + title = self.tr("Marking as 'unresolved'") + else: + title = self.tr("Marking as 'resolved'") + dia = HgDialog(title, self) res = dia.startProcess(args, repodir) if res: dia.exec_()
--- a/changelog Sat May 17 16:53:00 2014 +0200 +++ b/changelog Sat May 17 18:18:06 2014 +0200 @@ -52,6 +52,7 @@ --- added support for the shelve extension (as of Mercurial 2.8) --- added support for the largefiles extension (as of Mercurial 2.0) --- added support for Mercurial queues summary + --- added support for various 'resolve' subcommands - Third Party packages -- updated CharDet to 2.2.1
--- a/eric5.e4p Sat May 17 16:53:00 2014 +0200 +++ b/eric5.e4p Sat May 17 18:18:06 2014 +0200 @@ -1139,6 +1139,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py</Source> <Source>Utilities/mimetypes.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1467,6 +1468,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.ts</Translation>
--- a/i18n/eric5_cs.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_cs.ts Sat May 17 18:18:06 2014 +0200 @@ -9290,7 +9290,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -9390,112 +9390,112 @@ <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> @@ -9505,77 +9505,77 @@ <translation type="obsolete"><br><b>Pozor:</b> Ztratíte všechny změny pokud jej znovu otevřete.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Přidat soubory...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -9595,12 +9595,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -9675,7 +9675,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -9685,12 +9685,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -9735,12 +9735,12 @@ <translation type="obsolete"><p>Soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> @@ -9750,27 +9750,27 @@ <translation type="obsolete"><p>Soubor s makrem <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -9810,22 +9810,22 @@ <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -9870,27 +9870,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -19746,42 +19746,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <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="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -19791,22 +19791,22 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <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="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <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="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <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="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> @@ -19816,22 +19816,22 @@ <translation type="obsolete">Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -19846,19 +19846,19 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <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="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <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="2103"/> <source>Resolving files/directories</source> - <translation>Vyřešení souborů/složek</translation> + <translation type="obsolete">Vyřešení souborů/složek</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> @@ -19871,87 +19871,87 @@ <translation type="obsolete">Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <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="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <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="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <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="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <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="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -19961,7 +19961,7 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> @@ -19971,230 +19971,260 @@ <translation type="obsolete">Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <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="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21297,6 +21327,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished">Stisknutím odeslat vstup do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished">Zadejte data, která se odešlou do hg procesu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -23067,22 +23230,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> @@ -23097,7 +23260,7 @@ <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> @@ -23107,12 +23270,12 @@ <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> @@ -23132,7 +23295,7 @@ <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> @@ -23142,27 +23305,27 @@ <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> @@ -23172,17 +23335,17 @@ <translation type="obsolete">Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -23192,7 +23355,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -23202,7 +23365,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -23212,10 +23375,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -23610,157 +23783,157 @@ <translation type="obsolete"><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <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="454"/> - <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="461"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Seznam větví</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Seznam větví...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation>Narou&bovat větev...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <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> + <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="500"/> + <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="507"/> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Seznam tagů...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation>Zavřít větev</translation> + <source>List branches</source> + <translation>Seznam větví</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Seznam větví...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation>Zavře aktuální větev v lokálním projektu</translation> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <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="535"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Narou&bovat větev...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation>Zavřít větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <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="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <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="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -23785,22 +23958,22 @@ <translation type="obsolete"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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> @@ -23845,62 +24018,62 @@ <translation type="obsolete"><b>Zobrazit kombinovaná nastavení konfigurace</b><p>Toto zobrazí kombinovaná nastavení ze všech konfigurací.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <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="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <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="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <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="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <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> @@ -23910,112 +24083,112 @@ <translation type="obsolete">Administrace repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <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="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> <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="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <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="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <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="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <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="797"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Skip</source> <translation>Přeskočit</translation> </message> @@ -24030,72 +24203,72 @@ <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> <source>Reset</source> <translation>Reset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source>Reset the bisect search data</source> + <translation>Reset vyhledávání bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <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="1261"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> - <source>Reset the bisect search data</source> - <translation>Reset vyhledávání bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> - <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="1215"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation>Identifikovat adresář projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation>Identifikovat adresář projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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> @@ -24120,17 +24293,17 @@ <translation type="obsolete"><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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> @@ -24150,317 +24323,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24490,32 +24663,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -24555,180 +24728,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> + <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="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -66212,23 +66440,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -66246,23 +66474,23 @@ <translation type="obsolete"><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -66270,12 +66498,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="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_de.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_de.ts Sat May 17 18:18:06 2014 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1919,8 +1918,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="144"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -1988,8 +1987,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="92"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -8636,7 +8635,7 @@ <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -8701,57 +8700,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -8811,32 +8810,32 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> @@ -8881,7 +8880,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -8891,12 +8890,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -8926,17 +8925,17 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> @@ -8946,22 +8945,22 @@ <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -9001,82 +9000,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Dateien hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Aliased-Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -9131,12 +9130,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -9216,7 +9215,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -9226,12 +9225,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -9251,7 +9250,7 @@ <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric5 geöffnet war. Neu einlesen?</p></translation> </message> @@ -9281,22 +9280,22 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> @@ -9341,27 +9340,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -15772,8 +15771,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1090"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1163"/> @@ -18862,415 +18861,440 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <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="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <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="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <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="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <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="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <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="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <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="2103"/> - <source>Resolving files/directories</source> - <translation>Löse Dateien/Verzeichnisse auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <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="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <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="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <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="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <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="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <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="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <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="3429"/> - <source>Mercurial Command Server</source> - <translation>Mercurial-Befehlsserver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <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="3504"/> + <source>Mercurial Command Server</source> + <translation>Mercurial-Befehlsserver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <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="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <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="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <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="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <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="1112"/> + <source>Re-Merge</source> + <translation>Neu zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation>Neu zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation>Markiere als 'aufgelöst'</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20336,6 +20360,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation>Mercurial Konflikte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation><b>Konfliktliste</b>\n<p>Dies zeigt eine Liste der Dateien, die einen Konflikt hatten oder noch haben.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation>Drücken, um die ausgewählten Einträge als 'aufgelöst' zu markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation>Aufgelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation>Drücken, um die ausgewählten Einträge als 'nicht aufgelöst' zu markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation>Nicht Aufgelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation>Drücken, um die ausgewählten Einträge neu zusammenzuführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation>Neu zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation>Drücken, um den ausgewählten Eintrag zu bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation>Bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation>&Erneuern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation>Drücken, um die Liste der Konflikte zu erneuern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation>Unbekanter Status</translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -22099,37 +22256,37 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> @@ -22139,47 +22296,47 @@ <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Nur vom Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation>Verschieben</translation> </message> @@ -22189,7 +22346,7 @@ <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> @@ -22199,7 +22356,7 @@ <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> @@ -22209,10 +22366,20 @@ <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation>Konflikte ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation>Neu zusammenführen</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -22507,432 +22674,432 @@ <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="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <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="454"/> - <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="461"/> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Marken listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Zweige listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Zweige listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation>&Zweig erzeugen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <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> + <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="500"/> + <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="507"/> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Marken listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation>Zweig abschließen</translation> + <source>List branches</source> + <translation>Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Zweige listen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <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="535"/> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>&Zweig erzeugen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation>Zweig abschließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <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="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <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="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <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="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <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="675"/> - <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="682"/> - <source>Recover</source> - <translation>Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation>Transaktion zurücksetzen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <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="689"/> - <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="710"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <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="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <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="721"/> + <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="728"/> + <source>Recover</source> + <translation>Transaktion zurücksetzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation>Transaktion zurücksetzen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <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="735"/> + <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="756"/> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <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="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <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="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <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="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <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="790"/> - <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="797"/> - <source>Skip</source> - <translation>Überspringen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <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="822"/> + <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="829"/> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <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="836"/> + <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="843"/> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <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="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <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="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation>Identifiziere das Projektverzeichnis</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation>Identifiziere das Projektverzeichnis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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> @@ -22952,317 +23119,317 @@ <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="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation>Die letzte Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation>Erweiterungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation>Die letzte Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation>Erweiterungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation>Nutzerkonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation>Nutzerkonfiguration editieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation>Repositorykonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <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="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation>Phase ändern...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation>Änderungssätze kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <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="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation>Änderungssätze kopieren (Fortsetzung)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation>&Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <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="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> @@ -23292,32 +23459,32 @@ <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="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <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="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation>Verwaltung</translation> </message> @@ -23357,180 +23524,235 @@ <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="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <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="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation>Lesezeichen löschen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <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="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation>Lesezeichen umbenennen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation>Lesezeichen umbenennen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <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="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation>Lesezeichen verschieben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation>Lesezeichen verschieben …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <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="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> - <translation>Zeige eingehende Lesezeichen</translation> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> - <translation>Zeigt eine Liste eingehender Lesezeichen</translation> + <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="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation>Lesezeichen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <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="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> - <translation>Zeige ausgehende Lesezeichen</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <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="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation>Lesezeichen verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation>Lesezeichen verschieben …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <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="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation>Zeige eingehende Lesezeichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <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="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <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="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation>Zeige ausgehende Lesezeichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <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="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <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="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation>Zweige</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation>Neu zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation>Zeige Konflikte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation>Zeige Konflikte...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <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="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation>Konflikte ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation>Änderungen verwalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -62533,24 +62755,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -62559,24 +62781,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -62587,12 +62809,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_en.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_en.ts Sat May 17 18:18:06 2014 +0200 @@ -8531,7 +8531,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -8771,7 +8771,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -8956,262 +8956,262 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -9256,27 +9256,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -18757,415 +18757,440 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> - <source>Resolving files/directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20223,6 +20248,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -21953,42 +22111,42 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation type="unfinished"></translation> </message> @@ -21998,42 +22156,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -22043,7 +22201,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -22053,7 +22211,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -22063,10 +22221,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -22376,747 +22544,747 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <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="461"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <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="507"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> + <source>List branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> + <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <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="535"/> + <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <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="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> - <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="668"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <source>Verify the integrity of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> - <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="682"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <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="696"/> - <source>Identify</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Identify...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="710"/> - <source>Create .hgignore</source> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <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="714"/> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <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="728"/> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> - <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="739"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Preview changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Preview a changegroup file containing a collection of changesets</source> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <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="742"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="756"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <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="785"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <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="792"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="769"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <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="797"/> - <source>Skip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> - <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="825"/> - <source>Back out changeset</source> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <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="829"/> - <source>Back out changes of an earlier changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <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="866"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> - <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="1193"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> - <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="513"/> - <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="839"/> - <source>Rollback last transaction</source> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> - <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="1634"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> - <source>Import Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> - <source>Import a patch from a patch file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> - <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="1209"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> - <source>Revert Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> - <source>Export Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> - <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="909"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <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="871"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <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="912"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> + <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <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="1239"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <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="559"/> + <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="885"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> + <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="1707"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> + <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="1255"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> + <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="955"/> - <source>Add</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -23146,32 +23314,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -23211,180 +23379,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> + <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="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -61978,46 +62201,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -62025,12 +62248,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_es.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_es.ts Sat May 17 18:18:06 2014 +0200 @@ -8792,7 +8792,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -8902,197 +8902,197 @@ <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -9167,7 +9167,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -9177,12 +9177,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9222,37 +9222,37 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -9282,22 +9282,22 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> @@ -9342,27 +9342,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -18866,415 +18866,445 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <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="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <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="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <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="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <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="2103"/> <source>Resolving files/directories</source> - <translation>Resolviendo archivos/directorios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <translation type="obsolete">Resolviendo archivos/directorios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <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="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <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="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <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="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <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="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <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="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <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="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <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="3429"/> - <source>Mercurial Command Server</source> - <translation>Servidor de Comandos de Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <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="3504"/> + <source>Mercurial Command Server</source> + <translation>Servidor de Comandos de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <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="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <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="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <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="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <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="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <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="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20340,6 +20370,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">Estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Errores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Seleccionar para cambiar el campo de input a modo contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished">Actualiza&r</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">Error de Generación de Proceso</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -22105,57 +22268,57 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>Seleccionar todas las entradas de archivo locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> @@ -22165,27 +22328,27 @@ <translation>Mostrar archivo anotado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Eliminar solamente del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation>Mover</translation> </message> @@ -22195,7 +22358,7 @@ <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> @@ -22205,7 +22368,7 @@ <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> @@ -22215,10 +22378,20 @@ <translation>Mostrar diferencias lado a lado (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -22513,432 +22686,432 @@ <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="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <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="454"/> - <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="461"/> - <source>List tags</source> - <translation>Listar tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Listar tags...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Listar branches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Listar branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation>Crear branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation>Crear &branch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <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> + <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="500"/> + <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="507"/> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Listar tags...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation>Cerrar branch</translation> + <source>List branches</source> + <translation>Listar branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Listar branches...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation>Cerrar la branch actual para el proyecto local</translation> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <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="535"/> + <source>Create branch</source> + <translation>Crear branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Crear &branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation>Cerrar branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <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="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <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="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <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="675"/> - <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="682"/> - <source>Recover</source> - <translation>Recuperar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation>Recuperar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <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="689"/> - <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="710"/> - <source>Create .hgignore</source> - <translation>Crear .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Create a .hgignore file with default values</source> - <translation>Creare un archivo .hgignore con valores por defecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> - <translation>Crear changegroup...</translation> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <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="721"/> + <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="728"/> + <source>Recover</source> + <translation>Recuperar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation>Recuperar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <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="735"/> + <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="756"/> + <source>Create .hgignore</source> + <translation>Crear .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Creare un archivo .hgignore con valores por defecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Crear changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <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="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> - <source>Mark as "good"</source> - <translation>Marcar como "bueno"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <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="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation>Marcar como "malo"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <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="790"/> - <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="797"/> - <source>Skip</source> - <translation>Saltar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation>Reiniciar</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"</source> + <translation>Marcar como "bueno"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <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="822"/> + <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="829"/> + <source>Mark as "bad"</source> + <translation>Marcar como "malo"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <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="836"/> + <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="843"/> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation>Reiniciar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <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="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <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="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation>Identificar el directorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation>Identificar el directorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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> @@ -22958,317 +23131,317 @@ <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="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation>Rollback de la última transacción</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation>Extensiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation>Editar configuración de usuario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation>Editar configuración de usuario...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation>Rollback de la última transacción</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation>Extensiones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation>Editar configuración de usuario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation>Editar configuración de usuario...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation>Editar configuración del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation>Editar configuración del repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <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="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <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="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation>Cambiar Fase...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation>Copiar Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation>Copiar changesets de otra branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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 C opia</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="1268"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation>Copiar Changesets (Continuar)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation>Con&flictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation>Cambiar Fase...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation>Copiar Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation>Copiar changesets de otra branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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 C opia</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="1314"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation>Copiar Changesets (Continuar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation>Con&flictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> @@ -23298,32 +23471,32 @@ <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="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <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="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation>Administración</translation> </message> @@ -23363,180 +23536,235 @@ <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="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <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="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation>Borrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation>Borrar marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <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="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation>Renombrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation>Renombrar marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <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="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <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="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> - <translation>Mostrar marcadores entrantes</translation> + <source>Delete bookmark...</source> + <translation>Borrar marcador...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> - <translation>Muestra una lista de marcadores entrantes</translation> + <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="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation>Pull de marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <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="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> - <translation>Mostrar marcadores salientes</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark</source> + <translation>Renombrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation>Renombrar marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <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="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation>Mover marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <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="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation>Mostrar marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <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="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation>Pull de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <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="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation>Mostrar marcadores salientes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <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="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <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="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation>Branches</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -62485,17 +62713,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -62506,31 +62734,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -62539,12 +62767,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_fr.ts Sat May 17 18:18:06 2014 +0200 @@ -9942,7 +9942,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -10027,82 +10027,82 @@ <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> @@ -10112,7 +10112,7 @@ <translation type="obsolete"><br><b>Warning:</b> Toutes les modifications seront écrasées en réouvrant le fichier.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -10152,7 +10152,7 @@ <translation type="obsolete">Prière de sélectionner un rapport Cyclops à supprimer</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -10162,12 +10162,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -10197,17 +10197,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -10307,42 +10307,42 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Ajouter un fichier alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> @@ -10352,32 +10352,32 @@ <translation type="obsolete">Alias pour le fichier <b>%1</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -10432,12 +10432,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -10517,7 +10517,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -10527,12 +10527,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -10572,37 +10572,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -10632,22 +10632,22 @@ <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -10692,27 +10692,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -20977,82 +20977,82 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -21062,335 +21062,360 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> - <source>Resolving files/directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <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="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <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="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <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="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <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="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -22469,6 +22494,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">Etat (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Erreurs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Entrée</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">&Envoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">Mode Mot de &Passe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">Erreur du processus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -24249,22 +24407,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> @@ -24279,7 +24437,7 @@ <translation type="obsolete">Déplacer dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> @@ -24289,12 +24447,12 @@ <translation type="obsolete">Afficher un log limité</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> @@ -24314,7 +24472,7 @@ <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> @@ -24324,42 +24482,42 @@ <translation type="obsolete">Résoudre les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -24369,7 +24527,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -24379,7 +24537,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -24389,10 +24547,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -24762,157 +24930,157 @@ <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <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="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <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="451"/> - <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="454"/> - <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="461"/> - <source>List tags</source> - <translation type="unfinished">Lister les étiquettes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation type="unfinished">Lister les étiquettes...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <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="468"/> - <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="475"/> - <source>List branches</source> - <translation type="unfinished">Lister les branches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation type="unfinished">Lister les branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <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="482"/> - <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="489"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <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="500"/> + <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="507"/> + <source>List tags</source> + <translation type="unfinished">Lister les étiquettes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation type="unfinished">Lister les étiquettes...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <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="514"/> + <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="521"/> - <source>Close branch</source> - <translation type="unfinished"></translation> + <source>List branches</source> + <translation type="unfinished">Lister les branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation type="unfinished">Lister les branches...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> + <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="528"/> + <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="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation type="unfinished">Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation type="unfinished">&Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation type="unfinished">Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> @@ -24927,277 +25095,277 @@ <translation type="obsolete">&Options de commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <source>Verify the integrity of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> - <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="682"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <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="710"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <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="728"/> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <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="756"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <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="797"/> - <source>Skip</source> - <translation type="unfinished">Passer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation type="unfinished">Réinitialiser</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <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="829"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <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="843"/> + <source>Skip</source> + <translation type="unfinished">Passer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation type="unfinished">Réinitialiser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <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="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -25217,317 +25385,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished">Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -25557,32 +25725,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -25622,180 +25790,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished">Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished">Lister les signets ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <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="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished">Définir signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished">Définir signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <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="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished">Supprimer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Supprimer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <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="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished">Renommer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Renommer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <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="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished">Déplacer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished">Déplacer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <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="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Montrer nouveaux signets</translation> + <source>Delete bookmark...</source> + <translation type="unfinished">Supprimer signet ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Montrer la liste des nouveaux signets</translation> + <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="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished">Télécharger signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <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="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Montrer signets sortants</translation> + <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="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished">Renommer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Renommer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <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="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished">Déplacer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished">Déplacer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <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="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Montrer nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <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="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished">Télécharger signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <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="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Montrer signets sortants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <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="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <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="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -69988,24 +70211,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -70031,23 +70254,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -70058,12 +70281,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_it.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_it.ts Sat May 17 18:18:06 2014 +0200 @@ -9427,7 +9427,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -9512,87 +9512,87 @@ <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -9612,7 +9612,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -9622,12 +9622,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -9657,17 +9657,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -9707,72 +9707,72 @@ <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Aggiungi file...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Aggiungi files...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Aggiungi file sinonimo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -9822,12 +9822,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -9902,7 +9902,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -9912,12 +9912,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -9957,37 +9957,37 @@ <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Il file macro <b>{0}</b> è danneggiato.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Il file <b>{0}</b> è stato modificato mentre era aperto in eric5. Rileggerlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> @@ -10027,22 +10027,22 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file delle macro <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation>Attenzione: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> @@ -10087,27 +10087,27 @@ <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> @@ -19916,42 +19916,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -19961,22 +19961,22 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <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="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <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="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> @@ -19986,22 +19986,22 @@ <translation type="obsolete">Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -20016,19 +20016,19 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <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="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <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="2103"/> <source>Resolving files/directories</source> - <translation>Risoluzione di file/directory</translation> + <translation type="obsolete">Risoluzione di file/directory</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> @@ -20041,92 +20041,92 @@ <translation type="obsolete">Inserisci il nome del Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <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="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <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="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <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="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <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="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <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="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> @@ -20136,230 +20136,260 @@ <translation type="obsolete">Identifica i file changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <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="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <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="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <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="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <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="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <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="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21466,6 +21496,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">Stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished">Modifica</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Errori</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Input</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished">Premi per spedire l'input al processo hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">&Spedisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished">Inserisci i dati da inviare al processo hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">Modo &Password</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">Errore Generazione Processo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -23241,22 +23404,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> @@ -23271,7 +23434,7 @@ <translation type="obsolete">Muovi nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Mostra log</translation> </message> @@ -23281,12 +23444,12 @@ <translation type="obsolete">Mostra log ridotto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Mostra stato</translation> </message> @@ -23306,7 +23469,7 @@ <translation>Mostra file appuntati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> @@ -23316,27 +23479,27 @@ <translation type="obsolete">Risolvi conflitti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>Seleziona tutt i file locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> @@ -23346,7 +23509,7 @@ <translation type="obsolete">Vuoi veramente rimuovere questi file di traduzione dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> @@ -23356,12 +23519,12 @@ <translation type="obsolete">Conflitto risolto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation>Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation>Sposta</translation> </message> @@ -23381,7 +23544,7 @@ <translation>Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -23391,7 +23554,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -23401,10 +23564,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -23799,157 +23972,157 @@ <translation type="obsolete"><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <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="454"/> - <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="461"/> - <source>List tags</source> - <translation>Elenca tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Elenca tag...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation>Elenca i tag del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Elenca branches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Elenca branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation>Crea Branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation>Crea &Branch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <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> + <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="500"/> + <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="507"/> + <source>List tags</source> + <translation>Elenca tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Elenca tag...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation>Elenca i tag del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation>Chiudi branch</translation> + <source>List branches</source> + <translation>Elenca branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Elenca branches...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation>Chiudi il branch corrente del progetto locale</translation> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <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="535"/> + <source>Create branch</source> + <translation>Crea Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Crea &Branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation>Chiudi branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <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="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <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="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation>Esegui un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -23974,22 +24147,22 @@ <translation type="obsolete"><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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> @@ -24034,62 +24207,62 @@ <translation type="obsolete"><b>Mostra configurazioni combinate</b><p>Mostra configurazioni combinate da tutti i file di configurazione.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Verifica repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Verifica repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <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="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <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="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <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> @@ -24099,112 +24272,112 @@ <translation type="obsolete">Amministrazione repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <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="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> <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="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup...</source> <translation>Crea changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <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="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <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="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <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="797"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Skip</source> <translation>Salta</translation> </message> @@ -24219,72 +24392,72 @@ <translation type="obsolete"><b>Skip</b><p>Salta il changest corrente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <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="864"/> + <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="1261"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> - <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="818"/> - <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="1215"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation>Identifica la directory del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation>Identifica la directory del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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> @@ -24309,17 +24482,17 @@ <translation type="obsolete"><b>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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> @@ -24339,317 +24512,317 @@ <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="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished">Estensioni</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished">Estensioni</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24679,32 +24852,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -24744,180 +24917,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished">Lista i segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished">Lista i segnalibri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <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="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished">Definisci un segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished">Definisci un segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <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="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Cancella segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <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="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished">Rinomina segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Rinomina segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <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="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished">Sposta segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished">Sposta segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <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="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Mostra i segnalibri entranti</translation> + <source>Delete bookmark...</source> + <translation type="unfinished">Cancella segnalibro...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> + <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="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished">Estrae segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <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="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Mostra segnalibri uscenti</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished">Rinomina segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Rinomina segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <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="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished">Sposta segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished">Sposta segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <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="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Mostra i segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <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="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished">Estrae segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <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="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Mostra segnalibri uscenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <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="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished">Inserisci segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <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="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -67035,24 +67263,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -67078,24 +67306,24 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -67105,12 +67333,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_ru.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_ru.ts Sat May 17 18:18:06 2014 +0200 @@ -9466,7 +9466,7 @@ <translation type="obsolete"><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Файл изменён</translation> </message> @@ -9511,7 +9511,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -9541,82 +9541,82 @@ <translation>Левая клавиша мыши ставит точки останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> @@ -9666,7 +9666,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -9676,12 +9676,12 @@ <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> @@ -9711,17 +9711,17 @@ <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> @@ -9731,22 +9731,22 @@ <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -9791,82 +9791,82 @@ <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Добавить файл под другим именем...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> @@ -9921,12 +9921,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -10006,7 +10006,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -10016,12 +10016,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -10041,7 +10041,7 @@ <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в eric5. Обновить?</p></translation> </message> @@ -10081,22 +10081,22 @@ <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Макро <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> @@ -10141,27 +10141,27 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished">Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -20031,42 +20031,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -20076,32 +20076,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -20116,19 +20116,19 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> <source>Resolving files/directories</source> - <translation>Разрешение конфликтов</translation> + <translation type="obsolete">Разрешение конфликтов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> @@ -20136,12 +20136,12 @@ <translation type="obsolete">Создание меток в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> @@ -20156,92 +20156,92 @@ <translation type="obsolete">Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> @@ -20251,230 +20251,260 @@ <translation type="obsolete">Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation>Фиксировать изменения в репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation>Фиксировать изменения в репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation>Mercurial закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку, которая будет удалена:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation>Удалить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation>Переименовать Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation>Переместить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation>Тянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку, для перетаскивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку, для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Проталкивание закладки в удалённый репозиторий</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21576,6 +21606,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">Статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished">Редактировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished">Отправить данные процессу hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished">Задайте данные, которые будут посланы процессу hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -23356,22 +23519,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -23386,7 +23549,7 @@ <translation type="obsolete">Переместить в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Показать журнал</translation> </message> @@ -23396,7 +23559,7 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> @@ -23416,27 +23579,27 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Показать статус</translation> </message> @@ -23446,12 +23609,12 @@ <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> @@ -23461,7 +23624,7 @@ <translation type="obsolete">Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> @@ -23471,12 +23634,12 @@ <translation type="obsolete">Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation>Сдвинуть</translation> </message> @@ -23486,7 +23649,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -23496,7 +23659,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -23506,10 +23669,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished">Конфликт решён</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -23904,157 +24077,157 @@ <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Tag the local project in the repository</source> - <translation>Создать в репозитории метку для проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <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="461"/> - <source>List tags</source> - <translation>Список меток</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Список меток...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation>Список меток текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Список ветвей</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Список ветвей...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation>Создать ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation>Создать &ветвь...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <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> + <source>Tag the local project in the repository</source> + <translation>Создать в репозитории метку для проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <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="507"/> + <source>List tags</source> + <translation>Список меток</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Список меток...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation>Список меток текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation>Закрыть ветвь</translation> + <source>List branches</source> + <translation>Список ветвей</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Список ветвей...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation>Закрыть ветвь локального проекта</translation> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <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="535"/> + <source>Create branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Создать &ветвь...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation>Закрыть ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation>Закрыть ветвь локального проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -24079,22 +24252,22 @@ <translation type="obsolete"><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -24139,62 +24312,62 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <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="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> @@ -24204,112 +24377,112 @@ <translation type="obsolete">Администрирование репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> <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="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <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="797"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -24324,72 +24497,72 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source>Reset the bisect search data</source> + <translation>Сбросить данные двоичного поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <source>Bisect</source> + <translation>Двоичный поиск</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> - <source>Reset the bisect search data</source> - <translation>Сбросить данные двоичного поиска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Bisect</source> - <translation>Двоичный поиск</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation>Задайте каталог проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <source>Preview a changegroup file containing a collection of changesets</source> - <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify the project directory</source> + <translation>Задайте каталог проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <source>Preview a changegroup file containing a collection of changesets</source> + <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <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> @@ -24414,17 +24587,17 @@ <translation type="obsolete"><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -24444,317 +24617,317 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished">Конфликт решён</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished">Кон&фликт решён</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Конфликт решён</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished">Кон&фликт решён</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24784,32 +24957,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -24849,180 +25022,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation>Список закладок...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation>Список закладок проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>Define a bookmark for the project</source> <translation>Определить закладку для проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation>Удалить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Delete a bookmark of the project</source> - <translation>Удалить закладоку проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation>Переименовать закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation>Переименовать закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <source>Rename a bookmark of the project</source> - <translation>Переименовать закладку проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation>Переместить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation>Переместить закладку...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <source>Move a bookmark of the project</source> - <translation>Переместить закладку текущего проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> - <translation>Показать измененные закладки</translation> + <source>Delete bookmark...</source> + <translation>Удалить закладку...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> - <translation>Показать список измененных закладок</translation> + <source>Delete a bookmark of the project</source> + <translation>Удалить закладоку проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation>Тянуть закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>Pull a bookmark from a remote repository</source> - <translation>Загрузка закладки из удалённого репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> - <translation>Показать выходящие закладки</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Удалить закладку</b><p>Удалить закладку из текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark</source> + <translation>Переименовать закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation>Переименовать закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename a bookmark of the project</source> + <translation>Переименовать закладку проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation>Переместить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation>Переместить закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move a bookmark of the project</source> + <translation>Переместить закладку текущего проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation>Показать измененные закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show a list of incoming bookmarks</source> + <translation>Показать список измененных закладок</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation>Тянуть закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull a bookmark from a remote repository</source> + <translation>Загрузка закладки из удалённого репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation>Показать выходящие закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Show a list of outgoing bookmarks</source> <translation>Показать список выходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source>Push a bookmark to a remote repository</source> <translation>Проталкивание закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished">Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -67181,17 +67409,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -67202,30 +67430,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -67252,12 +67480,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_tr.ts Sat May 17 18:18:06 2014 +0200 @@ -9114,7 +9114,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> @@ -9364,7 +9364,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını etkinleştir</translation> </message> @@ -9549,52 +9549,52 @@ <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> @@ -9609,47 +9609,47 @@ <translation type="obsolete">Hazırda Pyparçaları "uyarı mesajı" yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Makro dosyası <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Makro dosyası <b>{0}</b> bozuk.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> @@ -9659,37 +9659,37 @@ <translation type="obsolete"><p>Makro dosyası <b>{0}</b> zaten açık.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Makro dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Eric5 ile açıldıktan sonra <b>{0}</b> dosyasında değişiklik olmuş. Yeniden açılsın mı?</p></translation> </message> @@ -9699,112 +9699,112 @@ <translation type="obsolete"><br><b>Uyarı:</b> Yapılan değişiklikleri yeniden açarken kaybedebilirsiniz.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>Dosya ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>Dosyaları ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>Kısaltmalar dosyasına ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation><b>{0} dosyası için takma ad</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> @@ -9814,22 +9814,22 @@ <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation>Dikkat: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Makro dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -9874,27 +9874,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -19731,82 +19731,82 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -19821,21 +19821,16 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <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="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> - <source>Resolving files/directories</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Create Branch</source> <translation type="obsolete">Sınıf(Branş) Oluştur</translation> @@ -19846,320 +19841,350 @@ <translation type="obsolete">Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <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="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <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="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21253,6 +21278,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">Durum</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished">Düzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">Hatalar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">Girdi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished">Hg işlem girdilerini göndermek için basınız</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">&Gönder</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished">Hg işlemlerine göndermek için verileri giriniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">&Parola Modu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">İşlem Üretecinde Hata</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -23013,27 +23171,27 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> @@ -23048,7 +23206,7 @@ <translation type="obsolete">Kaynak havuzuna taşı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> @@ -23058,12 +23216,12 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> @@ -23083,7 +23241,7 @@ <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> @@ -23093,22 +23251,22 @@ <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> @@ -23118,17 +23276,17 @@ <translation type="obsolete">Gerçekten bu çeviri dosyalarını kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -23138,7 +23296,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -23148,7 +23306,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -23158,10 +23316,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -23506,172 +23674,172 @@ <translation type="obsolete">Çelişkileri çö&zümle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <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="461"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <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="475"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <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="489"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <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="507"/> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <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="521"/> - <source>Close branch</source> - <translation type="unfinished"></translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <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="535"/> + <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <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="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> @@ -23686,262 +23854,262 @@ <translation type="obsolete">K&omut seçenekleri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> - <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="668"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <source>Verify the integrity of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> - <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="682"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <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="696"/> - <source>Identify</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Identify...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="710"/> - <source>Create .hgignore</source> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <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="714"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <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="728"/> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> - <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="739"/> - <source>Preview changegroup</source> - <translation>Değişimgrubu öngörünümü</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Preview changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Preview a changegroup file containing a collection of changesets</source> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <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="742"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="756"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <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="785"/> + <source>Preview changegroup</source> + <translation>Değişimgrubu öngörünümü</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <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="792"/> <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="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="769"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <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="797"/> - <source>Skip</source> - <translation>Atla</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation>Başadön</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> - <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="825"/> - <source>Back out changeset</source> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <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="829"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <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="843"/> + <source>Skip</source> + <translation>Atla</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation>Başadön</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <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="871"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -23961,317 +24129,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished">Ekle...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24301,32 +24469,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -24366,180 +24534,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> + <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="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -65517,24 +65740,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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> @@ -65560,23 +65783,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -65587,12 +65810,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat May 17 16:53:00 2014 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat May 17 18:18:06 2014 +0200 @@ -9560,7 +9560,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6915"/> + <location filename="../QScintilla/Editor.py" line="6914"/> <source>Check spelling...</source> <translation>正在进行拼写检查……</translation> </message> @@ -9815,7 +9815,7 @@ <translation>编辑断点……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4856"/> + <location filename="../QScintilla/Editor.py" line="4855"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -9980,42 +9980,42 @@ <translation>自动完成无效，没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4859"/> + <location filename="../QScintilla/Editor.py" line="4858"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5203"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5260"/> + <location filename="../QScintilla/Editor.py" line="5259"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5267"/> + <location filename="../QScintilla/Editor.py" line="5266"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5382"/> + <location filename="../QScintilla/Editor.py" line="5381"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> @@ -10040,37 +10040,37 @@ <translation type="obsolete">请选择要移除的循环报告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5542"/> + <location filename="../QScintilla/Editor.py" line="5541"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5857"/> + <location filename="../QScintilla/Editor.py" line="5856"/> <source>Select a macro name:</source> <translation>选择一个宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5885"/> + <location filename="../QScintilla/Editor.py" line="5884"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> @@ -10085,12 +10085,12 @@ <translation type="obsolete"><p>宏文件 <b>%1</b> 已损坏。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5928"/> + <location filename="../QScintilla/Editor.py" line="5927"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source>Save macro</source> <translation>保存宏</translation> </message> @@ -10100,7 +10100,7 @@ <translation type="obsolete"><p>宏文件 <b>%1</b> 已存在。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> @@ -10110,22 +10110,22 @@ <translation type="obsolete"><p>无法写入宏文件 <b>%1</b> 。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5974"/> + <location filename="../QScintilla/Editor.py" line="5973"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="5999"/> <source>Enter name of the macro:</source> <translation>输入宏名称：</translation> </message> @@ -10140,7 +10140,7 @@ <translation type="obsolete"><br><b>警告：</b> 重新打开将导致更改丢失。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6134"/> + <location filename="../QScintilla/Editor.py" line="6133"/> <source>File changed</source> <translation>文件已改变</translation> </message> @@ -10150,7 +10150,7 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source>Drop Error</source> <translation>降落误差</translation> </message> @@ -10160,47 +10160,47 @@ <translation type="obsolete"><p><b>%1</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6452"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6455"/> + <location filename="../QScintilla/Editor.py" line="6454"/> <source>Add file...</source> <translation>添加文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6457"/> + <location filename="../QScintilla/Editor.py" line="6456"/> <source>Add files...</source> <translation>添加文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6459"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Add aliased file...</source> <translation>添加别名文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6461"/> <source>Add localized resource...</source> <translation>添加本地资源……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6466"/> + <location filename="../QScintilla/Editor.py" line="6465"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6485"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6501"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> @@ -10210,42 +10210,42 @@ <translation type="obsolete">重命名文件 <b>%1</b>：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6593"/> + <location filename="../QScintilla/Editor.py" line="6592"/> <source>Include class attributes?</source> <translation>包含类属性？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6613"/> + <location filename="../QScintilla/Editor.py" line="6612"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6627"/> + <location filename="../QScintilla/Editor.py" line="6626"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6918"/> + <location filename="../QScintilla/Editor.py" line="6917"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6920"/> + <location filename="../QScintilla/Editor.py" line="6919"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -10285,37 +10285,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5899"/> + <location filename="../QScintilla/Editor.py" line="5898"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5908"/> + <location filename="../QScintilla/Editor.py" line="5907"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5961"/> + <location filename="../QScintilla/Editor.py" line="5960"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6124"/> + <location filename="../QScintilla/Editor.py" line="6123"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6432"/> + <location filename="../QScintilla/Editor.py" line="6431"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6529"/> + <location filename="../QScintilla/Editor.py" line="6528"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -10345,22 +10345,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5945"/> + <location filename="../QScintilla/Editor.py" line="5944"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5795"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5803"/> + <location filename="../QScintilla/Editor.py" line="5802"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6130"/> + <location filename="../QScintilla/Editor.py" line="6129"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -10405,27 +10405,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>Warning</source> <translation type="unfinished">警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5732"/> + <location filename="../QScintilla/Editor.py" line="5731"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5793"/> + <location filename="../QScintilla/Editor.py" line="5792"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -20676,82 +20676,82 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> <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="1770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -20761,335 +20761,360 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> - <source>Resolving files/directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <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="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/> <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="2780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> - <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="568"/> - <source>Committing changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/> - <source>Mercurial Command Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> - <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="3429"/> - <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="2848"/> + <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="572"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/> + <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="3504"/> + <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="2923"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <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="3119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <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="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/> <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="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/> <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="3056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <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="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <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="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <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="1112"/> + <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="1117"/> + <source>Re-Merging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <source>Marking as 'resolved'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -22168,6 +22193,139 @@ </message> </context> <context> + <name>HgConflictsListDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/> + <source>Mercurial Conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/> + <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/> + <source>Status</source> + <translation type="unfinished">状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/> + <source>Press to mark the selected entries as 'resolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/> + <source>Press to mark the selected entries as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/> + <source>Unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/> + <source>Press to re-merge the selected entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/> + <source>Press to edit the selected entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/> + <source>Edit</source> + <translation type="unfinished">编辑</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/> + <source>Errors</source> + <translation type="unfinished">错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/> + <source>Input</source> + <translation type="unfinished">输入</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/> + <source>&Send</source> + <translation type="unfinished">发送(&S)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/> + <source>&Password Mode</source> + <translation type="unfinished">密码模式(&P)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <source>Press to refresh the list of conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>Process Generation Error</source> + <translation type="unfinished">进程生成错误</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <source>Unknown Status</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCopyDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/> @@ -23948,22 +24106,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库（和磁盘）中移除</translation> </message> @@ -23978,7 +24136,7 @@ <translation type="obsolete">在储存库中移动</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/> <source>Show log</source> <translation type="unfinished">显示日志</translation> </message> @@ -23988,12 +24146,12 @@ <translation type="obsolete">显示受限日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/> <source>Show log browser</source> <translation type="unfinished">显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/> <source>Show status</source> <translation type="unfinished">显示状态</translation> </message> @@ -24013,7 +24171,7 @@ <translation type="unfinished">显示有注释的文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> @@ -24023,42 +24181,42 @@ <translation type="obsolete">解析冲突</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> <source>Select all local file entries</source> <translation type="unfinished">选择所有本地文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/> <source>Select all versioned file entries</source> <translation type="unfinished">选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -24068,7 +24226,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> @@ -24078,7 +24236,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> @@ -24088,10 +24246,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -24466,157 +24634,157 @@ <translation type="obsolete"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Tag in repository</source> <translation type="unfinished">在储存库中标记</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>&Tag in repository...</source> <translation type="unfinished">在储存库中标记(&T)……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">在储存库中标记本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags</source> - <translation type="unfinished">列出标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> - <source>List tags...</source> - <translation type="unfinished">列出标签……</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> - <source>List tags of the project</source> - <translation type="unfinished">列出项目的标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches</source> - <translation type="unfinished">列出分支</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> - <source>List branches...</source> - <translation type="unfinished">列出分支……</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>List branches of the project</source> - <translation type="unfinished">列出项目的分支</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>列出分支</b><p>列出项目的分支。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> - <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="497"/> - <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> - <translation type="unfinished"></translation> + <source>Tag the local project in the repository</source> + <translation type="unfinished">在储存库中标记本地项目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags</source> + <translation type="unfinished">列出标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <source>List tags...</source> + <translation type="unfinished">列出标签……</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags of the project</source> + <translation type="unfinished">列出项目的标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> - <source>Close branch</source> - <translation type="unfinished"></translation> + <source>List branches</source> + <translation type="unfinished">列出分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <source>List branches...</source> + <translation type="unfinished">列出分支……</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation type="unfinished">列出项目的分支</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>列出分支</b><p>列出项目的分支。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <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="543"/> + <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="567"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <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="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Cleanu&p</source> <translation type="unfinished">清除(&p)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Cleanup the local project</source> <translation type="unfinished">清除本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>Execute command</source> <translation type="unfinished">执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source>E&xecute command...</source> <translation type="unfinished">执行命令(&x)……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> @@ -24631,277 +24799,277 @@ <translation type="obsolete">命令选项(&o)……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure</source> <translation type="unfinished">配置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Configure...</source> <translation type="unfinished">配置……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <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="668"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> - <source>Verify repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <source>Verify the integrity of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> - <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="682"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <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="710"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> - <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="724"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Create changegroup...</source> + <source>Verify repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source>Verify repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify the integrity of the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <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="728"/> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <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="756"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <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="770"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <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="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <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="769"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> - <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="783"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <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="797"/> - <source>Skip</source> - <translation type="unfinished">跳过</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> - <source>Reset</source> - <translation type="unfinished">重置</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <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="829"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <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="843"/> + <source>Skip</source> + <translation type="unfinished">跳过</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <source>Reset</source> + <translation type="unfinished">重置</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <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="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> - <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="743"/> - <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="746"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <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="789"/> + <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="792"/> <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="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -24921,317 +25089,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <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="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <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="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <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="662"/> + <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="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <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="676"/> + <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="684"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <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="692"/> + <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="843"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <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="616"/> - <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="623"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <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="630"/> - <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="638"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> - <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="646"/> - <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="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <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="1634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <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="1209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <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="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> - <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="1674"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> - <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="940"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <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="947"/> - <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="1268"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <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="438"/> - <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="955"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <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="1747"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> + <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="986"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <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="993"/> + <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="1314"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <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="469"/> + <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="1001"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Add...</source> <translation type="unfinished">添加……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> <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="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <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="1276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -25261,32 +25429,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> <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="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <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="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -25326,180 +25494,235 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <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="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <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="1032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> - <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="1047"/> - <source>Rename bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/> - <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="1062"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> - <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="1078"/> - <source>Show incoming bookmarks</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Show a list of incoming bookmarks</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <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="1095"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <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="1111"/> - <source>Show outgoing bookmarks</source> + <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="1093"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <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="1108"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <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="1124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/> + <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="1141"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <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="1157"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <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="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <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="1239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Branches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <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="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <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="484"/> + <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="1327"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -69648,46 +69871,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/> <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="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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="2041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <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> @@ -69695,12 +69918,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
