Sun, 08 May 2011 15:19:58 +0200
Finished Mercurial bookmark support.
--- a/APIs/Python3/eric5.api Sun May 08 13:56:12 2011 +0200 +++ b/APIs/Python3/eric5.api Sun May 08 15:19:58 2011 +0200 @@ -3179,6 +3179,59 @@ eric5.Plugins.PluginWizardQRegExp.pyqtApi?7 eric5.Plugins.PluginWizardQRegExp.shortDescription?7 eric5.Plugins.PluginWizardQRegExp.version?7 +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.DEFINE_MODE?7 +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.MOVE_MODE?7 +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_nameCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_nameEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.HgBookmarkDialog?1(mode, tagsList, branchesList, bookmarksList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog.on_nameEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.HgBookmarkRenameDialog?1(bookmarksList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.INCOMING?7 +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.OUTGOING?7 +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.closeEvent?4(e) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog.start?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.HgBookmarksInOutDialog?1(vcs, mode, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.closeEvent?4(e) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.keyPressEvent?4(evt) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_buttonBox_clicked?4(button) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_input_returnPressed?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.on_sendButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog.start?4(path, bookmarksList) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.HgBookmarksListDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.getActions?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.initActions?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.initMenu?4(mainMenu) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper.setObjects?4(vcsObject, projectObject) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.BookmarksProjectHelper?1() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkDefine?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkDelete?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkIncoming?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkMove?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkOutgoing?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkPull?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkPush?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgBookmarkRename?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgGetBookmarksList?4(repodir) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.hgListBookmarks?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks.shutdown?4() +eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.Bookmarks?1(vcs) eric5.Plugins.VcsPlugins.vcsMercurial.Config.ConfigHgProtocols?7 eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() @@ -3192,10 +3245,26 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.start?4(fn) eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.getParameters?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_idEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_noneButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog?1(argvList, ppath, parent=None) @@ -3269,7 +3338,15 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, bookmarksList=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_projectDirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) @@ -3278,9 +3355,33 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog?1(vcs, project, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, showNone=False, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_idButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, showNone=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.getRevisions?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog?1(tagsList, branchesList, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_branch1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_branch2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_id1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_id1Edit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_id2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_id2Edit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_tag1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_tag2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog?1(vcs, path, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.closeEvent?4(e) @@ -3332,10 +3433,12 @@ eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.getActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initMenu?4(menu) +eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.setObjects?4(vcsObject, projectObject) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.committed?7 +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getExtensionObject?4(extensionName) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getPlugin?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAnnotate?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBackout?4(name) @@ -3347,6 +3450,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentifyBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) @@ -3368,6 +3473,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowPaths?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgUnbundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgVerify?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.isExtensionActive?4(extensionName) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAdd?4(name, isDir=False, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAddBinary?4(name, isDir=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAddTree?4(path)
--- a/Documentation/Help/source.qhp Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Help/source.qhp Sun May 08 15:19:58 2011 +0200 @@ -360,6 +360,14 @@ </section> <section title="eric5.Plugins.VcsPlugins" ref="index-eric5.Plugins.VcsPlugins.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.html"> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html"> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html" /> + </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> </section> @@ -8336,10 +8344,14 @@ <keyword name="hg (Module)" id="hg (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html" /> <keyword name="Hg" id="Hg" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> + <keyword name="Hg.__getExtensionsInfo" id="Hg.__getExtensionsInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getExtensionsInfo" /> <keyword name="Hg.__hgURL" id="Hg.__hgURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgURL" /> + <keyword name="Hg.__iniFileChanged" id="Hg.__iniFileChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__iniFileChanged" /> + <keyword name="Hg.__monitorRepoIniFile" id="Hg.__monitorRepoIniFile" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__monitorRepoIniFile" /> <keyword name="Hg.__vcsCommit_Step2" id="Hg.__vcsCommit_Step2" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__vcsCommit_Step2" /> <keyword name="Hg._createStatusMonitorThread" id="Hg._createStatusMonitorThread" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg._createStatusMonitorThread" /> <keyword name="Hg.clearStatusCache" id="Hg.clearStatusCache" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.clearStatusCache" /> + <keyword name="Hg.getExtensionObject" id="Hg.getExtensionObject" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getExtensionObject" /> <keyword name="Hg.getPlugin" id="Hg.getPlugin" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getPlugin" /> <keyword name="Hg.hgAnnotate" id="Hg.hgAnnotate" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAnnotate" /> <keyword name="Hg.hgBackout" id="Hg.hgBackout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBackout" /> @@ -8351,6 +8363,8 @@ <keyword name="Hg.hgEditConfig" id="Hg.hgEditConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditConfig" /> <keyword name="Hg.hgExtendedDiff" id="Hg.hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExtendedDiff" /> <keyword name="Hg.hgForget" id="Hg.hgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgForget" /> + <keyword name="Hg.hgGetBranchesList" id="Hg.hgGetBranchesList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBranchesList" /> + <keyword name="Hg.hgGetTagsList" id="Hg.hgGetTagsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetTagsList" /> <keyword name="Hg.hgIdentify" id="Hg.hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentify" /> <keyword name="Hg.hgIdentifyBundle" id="Hg.hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentifyBundle" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> @@ -8372,6 +8386,7 @@ <keyword name="Hg.hgShowPaths" id="Hg.hgShowPaths" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgShowPaths" /> <keyword name="Hg.hgUnbundle" id="Hg.hgUnbundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgUnbundle" /> <keyword name="Hg.hgVerify" id="Hg.hgVerify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgVerify" /> + <keyword name="Hg.isExtensionActive" id="Hg.isExtensionActive" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.isExtensionActive" /> <keyword name="Hg.vcsAdd" id="Hg.vcsAdd" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsAdd" /> <keyword name="Hg.vcsAddBinary" id="Hg.vcsAddBinary" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsAddBinary" /> <keyword name="Hg.vcsAddTree" id="Hg.vcsAddTree" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsAddTree" /> @@ -8475,9 +8490,11 @@ <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.__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" /> <keyword name="HgProjectHelper.initActions" id="HgProjectHelper.initActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.initActions" /> <keyword name="HgProjectHelper.initMenu" id="HgProjectHelper.initMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.initMenu" /> + <keyword name="HgProjectHelper.setObjects" id="HgProjectHelper.setObjects" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.setObjects" /> <keyword name="HgAnnotateDialog (Module)" id="HgAnnotateDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html" /> <keyword name="HgAnnotateDialog" id="HgAnnotateDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog" /> <keyword name="HgAnnotateDialog (Constructor)" id="HgAnnotateDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html#HgAnnotateDialog.__init__" /> @@ -8497,7 +8514,16 @@ <keyword name="HgMergeDialog (Module)" id="HgMergeDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> <keyword name="HgMergeDialog" id="HgMergeDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog" /> <keyword name="HgMergeDialog (Constructor)" id="HgMergeDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.__init__" /> + <keyword name="HgMergeDialog.__updateOK" id="HgMergeDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.__updateOK" /> <keyword name="HgMergeDialog.getParameters" id="HgMergeDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.getParameters" /> + <keyword name="HgMergeDialog.on_bookmarkButton_toggled" id="HgMergeDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_bookmarkButton_toggled" /> + <keyword name="HgMergeDialog.on_bookmarkCombo_editTextChanged" id="HgMergeDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgMergeDialog.on_branchButton_toggled" id="HgMergeDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_branchButton_toggled" /> + <keyword name="HgMergeDialog.on_branchCombo_editTextChanged" id="HgMergeDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgMergeDialog.on_idButton_toggled" id="HgMergeDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idButton_toggled" /> + <keyword name="HgMergeDialog.on_idEdit_textChanged" id="HgMergeDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idEdit_textChanged" /> + <keyword name="HgMergeDialog.on_tagButton_toggled" id="HgMergeDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagButton_toggled" /> + <keyword name="HgMergeDialog.on_tagCombo_editTextChanged" id="HgMergeDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagCombo_editTextChanged" /> <keyword name="HgCommandDialog (Module)" id="HgCommandDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> <keyword name="HgCommandDialog" id="HgCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog" /> <keyword name="HgCommandDialog (Constructor)" id="HgCommandDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog.__init__" /> @@ -8527,7 +8553,24 @@ <keyword name="HgRevisionsSelectionDialog" id="HgRevisionsSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog" /> <keyword name="HgRevisionsSelectionDialog (Constructor)" id="HgRevisionsSelectionDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.__init__" /> <keyword name="HgRevisionsSelectionDialog.__getRevision" id="HgRevisionsSelectionDialog.__getRevision" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.__getRevision" /> + <keyword name="HgRevisionsSelectionDialog.__updateOK" id="HgRevisionsSelectionDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.__updateOK" /> <keyword name="HgRevisionsSelectionDialog.getRevisions" id="HgRevisionsSelectionDialog.getRevisions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.getRevisions" /> + <keyword name="HgRevisionsSelectionDialog.on_bookmark1Button_toggled" id="HgRevisionsSelectionDialog.on_bookmark1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_bookmark1Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_bookmark2Button_toggled" id="HgRevisionsSelectionDialog.on_bookmark2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_bookmark2Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_branch1Button_toggled" id="HgRevisionsSelectionDialog.on_branch1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_branch1Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_branch2Button_toggled" id="HgRevisionsSelectionDialog.on_branch2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_branch2Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_id1Button_toggled" id="HgRevisionsSelectionDialog.on_id1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_id1Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_id1Edit_textChanged" id="HgRevisionsSelectionDialog.on_id1Edit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_id1Edit_textChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_id2Button_toggled" id="HgRevisionsSelectionDialog.on_id2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_id2Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_id2Edit_textChanged" id="HgRevisionsSelectionDialog.on_id2Edit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_id2Edit_textChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_tag1Button_toggled" id="HgRevisionsSelectionDialog.on_tag1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_tag1Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged" /> + <keyword name="HgRevisionsSelectionDialog.on_tag2Button_toggled" id="HgRevisionsSelectionDialog.on_tag2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_tag2Button_toggled" /> + <keyword name="HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged" id="HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html#HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged" /> <keyword name="HgUtilities (Module)" id="HgUtilities (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" /> <keyword name="getConfigPath" id="getConfigPath" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#getConfigPath" /> <keyword name="HgLogDialog (Module)" id="HgLogDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> @@ -8551,7 +8594,16 @@ <keyword name="HgRevisionSelectionDialog (Module)" id="HgRevisionSelectionDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html" /> <keyword name="HgRevisionSelectionDialog" id="HgRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog" /> <keyword name="HgRevisionSelectionDialog (Constructor)" id="HgRevisionSelectionDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.__init__" /> + <keyword name="HgRevisionSelectionDialog.__updateOK" id="HgRevisionSelectionDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.__updateOK" /> <keyword name="HgRevisionSelectionDialog.getRevision" id="HgRevisionSelectionDialog.getRevision" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.getRevision" /> + <keyword name="HgRevisionSelectionDialog.on_bookmarkButton_toggled" id="HgRevisionSelectionDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_bookmarkButton_toggled" /> + <keyword name="HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" id="HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgRevisionSelectionDialog.on_branchButton_toggled" id="HgRevisionSelectionDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_branchButton_toggled" /> + <keyword name="HgRevisionSelectionDialog.on_branchCombo_editTextChanged" id="HgRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgRevisionSelectionDialog.on_idButton_toggled" id="HgRevisionSelectionDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_idButton_toggled" /> + <keyword name="HgRevisionSelectionDialog.on_idEdit_textChanged" id="HgRevisionSelectionDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_idEdit_textChanged" /> + <keyword name="HgRevisionSelectionDialog.on_tagButton_toggled" id="HgRevisionSelectionDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_tagButton_toggled" /> + <keyword name="HgRevisionSelectionDialog.on_tagCombo_editTextChanged" id="HgRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.on_tagCombo_editTextChanged" /> <keyword name="Config (Module)" id="Config (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.Config.html" /> <keyword name="HgDialog (Module)" id="HgDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> <keyword name="HgDialog" id="HgDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog" /> @@ -8572,8 +8624,17 @@ <keyword name="HgBackoutDialog (Module)" id="HgBackoutDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html" /> <keyword name="HgBackoutDialog" id="HgBackoutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog" /> <keyword name="HgBackoutDialog (Constructor)" id="HgBackoutDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.__init__" /> + <keyword name="HgBackoutDialog.__updateOK" id="HgBackoutDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.__updateOK" /> <keyword name="HgBackoutDialog.getParameters" id="HgBackoutDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.getParameters" /> + <keyword name="HgBackoutDialog.on_bookmarkButton_toggled" id="HgBackoutDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_bookmarkButton_toggled" /> + <keyword name="HgBackoutDialog.on_bookmarkCombo_editTextChanged" id="HgBackoutDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBackoutDialog.on_branchButton_toggled" id="HgBackoutDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_branchButton_toggled" /> + <keyword name="HgBackoutDialog.on_branchCombo_editTextChanged" id="HgBackoutDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgBackoutDialog.on_idButton_toggled" id="HgBackoutDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_idButton_toggled" /> + <keyword name="HgBackoutDialog.on_idEdit_textChanged" id="HgBackoutDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_idEdit_textChanged" /> <keyword name="HgBackoutDialog.on_noneButton_toggled" id="HgBackoutDialog.on_noneButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_noneButton_toggled" /> + <keyword name="HgBackoutDialog.on_tagButton_toggled" id="HgBackoutDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_tagButton_toggled" /> + <keyword name="HgBackoutDialog.on_tagCombo_editTextChanged" id="HgBackoutDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html#HgBackoutDialog.on_tagCombo_editTextChanged" /> <keyword name="HgLogBrowserDialog (Module)" id="HgLogBrowserDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <keyword name="HgLogBrowserDialog" id="HgLogBrowserDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog" /> <keyword name="HgLogBrowserDialog (Constructor)" id="HgLogBrowserDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__init__" /> @@ -8622,7 +8683,16 @@ <keyword name="HgBundleDialog (Module)" id="HgBundleDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html" /> <keyword name="HgBundleDialog" id="HgBundleDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog" /> <keyword name="HgBundleDialog (Constructor)" id="HgBundleDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.__init__" /> + <keyword name="HgBundleDialog.__updateOK" id="HgBundleDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.__updateOK" /> <keyword name="HgBundleDialog.getParameters" id="HgBundleDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.getParameters" /> + <keyword name="HgBundleDialog.on_bookmarkButton_toggled" id="HgBundleDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_bookmarkButton_toggled" /> + <keyword name="HgBundleDialog.on_bookmarkCombo_editTextChanged" id="HgBundleDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBundleDialog.on_branchButton_toggled" id="HgBundleDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_branchButton_toggled" /> + <keyword name="HgBundleDialog.on_branchCombo_editTextChanged" id="HgBundleDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgBundleDialog.on_idButton_toggled" id="HgBundleDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_idButton_toggled" /> + <keyword name="HgBundleDialog.on_idEdit_textChanged" id="HgBundleDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_idEdit_textChanged" /> + <keyword name="HgBundleDialog.on_tagButton_toggled" id="HgBundleDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_tagButton_toggled" /> + <keyword name="HgBundleDialog.on_tagCombo_editTextChanged" id="HgBundleDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_tagCombo_editTextChanged" /> <keyword name="HgTagBranchListDialog (Module)" id="HgTagBranchListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" /> <keyword name="HgTagBranchListDialog" id="HgTagBranchListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog" /> <keyword name="HgTagBranchListDialog (Constructor)" id="HgTagBranchListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__init__" /> @@ -9414,6 +9484,95 @@ <keyword name="MercurialPage (Constructor)" id="MercurialPage (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.__init__" /> <keyword name="MercurialPage.on_configButton_clicked" id="MercurialPage.on_configButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.on_configButton_clicked" /> <keyword name="MercurialPage.save" id="MercurialPage.save" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.save" /> + <keyword name="BookmarksExtension (Package)" id="BookmarksExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html" /> + <keyword name="bookmarks (Module)" id="bookmarks (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html" /> + <keyword name="Bookmarks" id="Bookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks" /> + <keyword name="Bookmarks (Constructor)" id="Bookmarks (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.__init__" /> + <keyword name="Bookmarks.__getInOutBookmarks" id="Bookmarks.__getInOutBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.__getInOutBookmarks" /> + <keyword name="Bookmarks.hgBookmarkDefine" id="Bookmarks.hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkDefine" /> + <keyword name="Bookmarks.hgBookmarkDelete" id="Bookmarks.hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkDelete" /> + <keyword name="Bookmarks.hgBookmarkIncoming" id="Bookmarks.hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkIncoming" /> + <keyword name="Bookmarks.hgBookmarkMove" id="Bookmarks.hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkMove" /> + <keyword name="Bookmarks.hgBookmarkOutgoing" id="Bookmarks.hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkOutgoing" /> + <keyword name="Bookmarks.hgBookmarkPull" id="Bookmarks.hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkPull" /> + <keyword name="Bookmarks.hgBookmarkPush" id="Bookmarks.hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkPush" /> + <keyword name="Bookmarks.hgBookmarkRename" id="Bookmarks.hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgBookmarkRename" /> + <keyword name="Bookmarks.hgGetBookmarksList" id="Bookmarks.hgGetBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgGetBookmarksList" /> + <keyword name="Bookmarks.hgListBookmarks" id="Bookmarks.hgListBookmarks" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.hgListBookmarks" /> + <keyword name="Bookmarks.shutdown" id="Bookmarks.shutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html#Bookmarks.shutdown" /> + <keyword name="HgBookmarksInOutDialog (Module)" id="HgBookmarksInOutDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html" /> + <keyword name="HgBookmarksInOutDialog" id="HgBookmarksInOutDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog" /> + <keyword name="HgBookmarksInOutDialog (Constructor)" id="HgBookmarksInOutDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__init__" /> + <keyword name="HgBookmarksInOutDialog.__finish" id="HgBookmarksInOutDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__finish" /> + <keyword name="HgBookmarksInOutDialog.__generateItem" id="HgBookmarksInOutDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__generateItem" /> + <keyword name="HgBookmarksInOutDialog.__procFinished" id="HgBookmarksInOutDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__procFinished" /> + <keyword name="HgBookmarksInOutDialog.__readStderr" id="HgBookmarksInOutDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStderr" /> + <keyword name="HgBookmarksInOutDialog.__readStdout" id="HgBookmarksInOutDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__readStdout" /> + <keyword name="HgBookmarksInOutDialog.__resizeColumns" id="HgBookmarksInOutDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resizeColumns" /> + <keyword name="HgBookmarksInOutDialog.__resort" id="HgBookmarksInOutDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.__resort" /> + <keyword name="HgBookmarksInOutDialog.closeEvent" id="HgBookmarksInOutDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.closeEvent" /> + <keyword name="HgBookmarksInOutDialog.keyPressEvent" id="HgBookmarksInOutDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.keyPressEvent" /> + <keyword name="HgBookmarksInOutDialog.on_buttonBox_clicked" id="HgBookmarksInOutDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_buttonBox_clicked" /> + <keyword name="HgBookmarksInOutDialog.on_input_returnPressed" id="HgBookmarksInOutDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_input_returnPressed" /> + <keyword name="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" id="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgBookmarksInOutDialog.on_sendButton_clicked" id="HgBookmarksInOutDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.on_sendButton_clicked" /> + <keyword name="HgBookmarksInOutDialog.start" id="HgBookmarksInOutDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html#HgBookmarksInOutDialog.start" /> + <keyword name="HgBookmarkDialog (Module)" id="HgBookmarkDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html" /> + <keyword name="HgBookmarkDialog" id="HgBookmarkDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog" /> + <keyword name="HgBookmarkDialog (Constructor)" id="HgBookmarkDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__init__" /> + <keyword name="HgBookmarkDialog.__updateBookmarksCombo" id="HgBookmarkDialog.__updateBookmarksCombo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__updateBookmarksCombo" /> + <keyword name="HgBookmarkDialog.__updateOK" id="HgBookmarkDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.__updateOK" /> + <keyword name="HgBookmarkDialog.getData" id="HgBookmarkDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.getData" /> + <keyword name="HgBookmarkDialog.on_bookmarkButton_toggled" id="HgBookmarkDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkButton_toggled" /> + <keyword name="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBookmarkDialog.on_branchButton_toggled" id="HgBookmarkDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_branchButton_toggled" /> + <keyword name="HgBookmarkDialog.on_branchCombo_editTextChanged" id="HgBookmarkDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgBookmarkDialog.on_idButton_toggled" id="HgBookmarkDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_idButton_toggled" /> + <keyword name="HgBookmarkDialog.on_idEdit_textChanged" id="HgBookmarkDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_idEdit_textChanged" /> + <keyword name="HgBookmarkDialog.on_nameCombo_activated" id="HgBookmarkDialog.on_nameCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_nameCombo_activated" /> + <keyword name="HgBookmarkDialog.on_nameEdit_textChanged" id="HgBookmarkDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_nameEdit_textChanged" /> + <keyword name="HgBookmarkDialog.on_tagButton_toggled" id="HgBookmarkDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_tagButton_toggled" /> + <keyword name="HgBookmarkDialog.on_tagCombo_editTextChanged" id="HgBookmarkDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html#HgBookmarkDialog.on_tagCombo_editTextChanged" /> + <keyword name="HgBookmarksListDialog (Module)" id="HgBookmarksListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html" /> + <keyword name="HgBookmarksListDialog" id="HgBookmarksListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog" /> + <keyword name="HgBookmarksListDialog (Constructor)" id="HgBookmarksListDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__init__" /> + <keyword name="HgBookmarksListDialog.__finish" id="HgBookmarksListDialog.__finish" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__finish" /> + <keyword name="HgBookmarksListDialog.__generateItem" id="HgBookmarksListDialog.__generateItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__generateItem" /> + <keyword name="HgBookmarksListDialog.__procFinished" id="HgBookmarksListDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__procFinished" /> + <keyword name="HgBookmarksListDialog.__readStderr" id="HgBookmarksListDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStderr" /> + <keyword name="HgBookmarksListDialog.__readStdout" id="HgBookmarksListDialog.__readStdout" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__readStdout" /> + <keyword name="HgBookmarksListDialog.__resizeColumns" id="HgBookmarksListDialog.__resizeColumns" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__resizeColumns" /> + <keyword name="HgBookmarksListDialog.__resort" id="HgBookmarksListDialog.__resort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.__resort" /> + <keyword name="HgBookmarksListDialog.closeEvent" id="HgBookmarksListDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.closeEvent" /> + <keyword name="HgBookmarksListDialog.keyPressEvent" id="HgBookmarksListDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.keyPressEvent" /> + <keyword name="HgBookmarksListDialog.on_buttonBox_clicked" id="HgBookmarksListDialog.on_buttonBox_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_buttonBox_clicked" /> + <keyword name="HgBookmarksListDialog.on_input_returnPressed" id="HgBookmarksListDialog.on_input_returnPressed" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_input_returnPressed" /> + <keyword name="HgBookmarksListDialog.on_passwordCheckBox_toggled" id="HgBookmarksListDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgBookmarksListDialog.on_sendButton_clicked" id="HgBookmarksListDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.on_sendButton_clicked" /> + <keyword name="HgBookmarksListDialog.start" id="HgBookmarksListDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html#HgBookmarksListDialog.start" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html" /> + <keyword name="BookmarksProjectHelper" id="BookmarksProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper" /> + <keyword name="BookmarksProjectHelper (Constructor)" id="BookmarksProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__init__" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkDefine" id="BookmarksProjectHelper.__hgBookmarkDefine" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkDefine" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkDelete" id="BookmarksProjectHelper.__hgBookmarkDelete" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkDelete" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkIncoming" id="BookmarksProjectHelper.__hgBookmarkIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkIncoming" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkMove" id="BookmarksProjectHelper.__hgBookmarkMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkMove" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkOutgoing" id="BookmarksProjectHelper.__hgBookmarkOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkOutgoing" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkPull" id="BookmarksProjectHelper.__hgBookmarkPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkPull" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkPush" id="BookmarksProjectHelper.__hgBookmarkPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkPush" /> + <keyword name="BookmarksProjectHelper.__hgBookmarkRename" id="BookmarksProjectHelper.__hgBookmarkRename" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarkRename" /> + <keyword name="BookmarksProjectHelper.__hgBookmarksList" id="BookmarksProjectHelper.__hgBookmarksList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.__hgBookmarksList" /> + <keyword name="BookmarksProjectHelper.getActions" id="BookmarksProjectHelper.getActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.getActions" /> + <keyword name="BookmarksProjectHelper.initActions" id="BookmarksProjectHelper.initActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.initActions" /> + <keyword name="BookmarksProjectHelper.initMenu" id="BookmarksProjectHelper.initMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.initMenu" /> + <keyword name="BookmarksProjectHelper.setObjects" id="BookmarksProjectHelper.setObjects" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html#BookmarksProjectHelper.setObjects" /> + <keyword name="HgBookmarkRenameDialog (Module)" id="HgBookmarkRenameDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html" /> + <keyword name="HgBookmarkRenameDialog" id="HgBookmarkRenameDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog" /> + <keyword name="HgBookmarkRenameDialog (Constructor)" id="HgBookmarkRenameDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__init__" /> + <keyword name="HgBookmarkRenameDialog.__updateUI" id="HgBookmarkRenameDialog.__updateUI" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.__updateUI" /> + <keyword name="HgBookmarkRenameDialog.getData" id="HgBookmarkRenameDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.getData" /> + <keyword name="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" id="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgBookmarkRenameDialog.on_nameEdit_textChanged" id="HgBookmarkRenameDialog.on_nameEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html#HgBookmarkRenameDialog.on_nameEdit_textChanged" /> <keyword name="ConfigurationPage (Package)" id="ConfigurationPage (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.html" /> <keyword name="SubversionPage (Module)" id="SubversionPage (Module)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.html" /> <keyword name="SubversionPage" id="SubversionPage" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.html#SubversionPage" /> @@ -10612,6 +10771,12 @@ <file>eric5.Plugins.PluginWizardQInputDialog.html</file> <file>eric5.Plugins.PluginWizardQMessageBox.html</file> <file>eric5.Plugins.PluginWizardQRegExp.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html</file> @@ -10989,6 +11154,7 @@ <file>index-eric5.Plugins.DocumentationPlugins.Ericdoc.html</file> <file>index-eric5.Plugins.DocumentationPlugins.html</file> <file>index-eric5.Plugins.VcsPlugins.html</file> + <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,241 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog</title> +<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.BookmarksExtension.HgBookmarkDialog</h1> +<p> +Module implementing the bookmark dialog. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarkDialog">HgBookmarkDialog</a></td> +<td>Class mplementing the bookmark dialog.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarkDialog" ID="HgBookmarkDialog"></a> +<h2>HgBookmarkDialog</h2> +<p> + Class mplementing the bookmark dialog. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarkDialog +<h3>Class Attributes</h3> +<table> +<tr><td>DEFINE_MODE</td></tr><tr><td>MOVE_MODE</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarkDialog.__init__">HgBookmarkDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.__updateBookmarksCombo">__updateBookmarksCombo</a></td> +<td>Private slot to update the bookmarks combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_nameCombo_activated">on_nameCombo_activated</a></td> +<td>Private slot to handle changes of the selected bookmark name.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> +<td>Private slot to handle changes of the bookmark name.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgBookmarkDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<a NAME="HgBookmarkDialog.__init__" ID="HgBookmarkDialog.__init__"></a> +<h4>HgBookmarkDialog (Constructor)</h4> +<b>HgBookmarkDialog</b>(<i>mode, tagsList, branchesList, bookmarksList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>mode</i></dt> +<dd> +of the dialog (integer) +</dd><dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarkDialog.__updateBookmarksCombo" ID="HgBookmarkDialog.__updateBookmarksCombo"></a> +<h4>HgBookmarkDialog.__updateBookmarksCombo</h4> +<b>__updateBookmarksCombo</b>(<i></i>) +<p> + Private slot to update the bookmarks combo. +</p><a NAME="HgBookmarkDialog.__updateOK" ID="HgBookmarkDialog.__updateOK"></a> +<h4>HgBookmarkDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgBookmarkDialog.getData" ID="HgBookmarkDialog.getData"></a> +<h4>HgBookmarkDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the revision and the bookmark name + (string, string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_bookmarkButton_toggled" ID="HgBookmarkDialog.on_bookmarkButton_toggled"></a> +<h4>HgBookmarkDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_branchButton_toggled" ID="HgBookmarkDialog.on_branchButton_toggled"></a> +<h4>HgBookmarkDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_branchCombo_editTextChanged" ID="HgBookmarkDialog.on_branchCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_idButton_toggled" ID="HgBookmarkDialog.on_idButton_toggled"></a> +<h4>HgBookmarkDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_idEdit_textChanged" ID="HgBookmarkDialog.on_idEdit_textChanged"></a> +<h4>HgBookmarkDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_nameCombo_activated" ID="HgBookmarkDialog.on_nameCombo_activated"></a> +<h4>HgBookmarkDialog.on_nameCombo_activated</h4> +<b>on_nameCombo_activated</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected bookmark name. +</p><a NAME="HgBookmarkDialog.on_nameEdit_textChanged" ID="HgBookmarkDialog.on_nameEdit_textChanged"></a> +<h4>HgBookmarkDialog.on_nameEdit_textChanged</h4> +<b>on_nameEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the bookmark name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgBookmarkDialog.on_tagButton_toggled" ID="HgBookmarkDialog.on_tagButton_toggled"></a> +<h4>HgBookmarkDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBookmarkDialog.on_tagCombo_editTextChanged" ID="HgBookmarkDialog.on_tagCombo_editTextChanged"></a> +<h4>HgBookmarkDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog</title> +<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.BookmarksExtension.HgBookmarkRenameDialog</h1> +<p> +Module implementing a dialog to get the data to rename a bookmark. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarkRenameDialog">HgBookmarkRenameDialog</a></td> +<td>Class implementing a dialog to get the data to rename a bookmark.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarkRenameDialog" ID="HgBookmarkRenameDialog"></a> +<h2>HgBookmarkRenameDialog</h2> +<p> + Class implementing a dialog to get the data to rename a bookmark. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarkRenameDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarkRenameDialog.__init__">HgBookmarkRenameDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.__updateUI">__updateUI</a></td> +<td>Private slot to update the UI.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the selected bookmark.</td> +</tr><tr> +<td><a href="#HgBookmarkRenameDialog.on_nameEdit_textChanged">on_nameEdit_textChanged</a></td> +<td>Private slot to handle changes of the bookmark name.</td> +</tr> +</table> +<a NAME="HgBookmarkRenameDialog.__init__" ID="HgBookmarkRenameDialog.__init__"></a> +<h4>HgBookmarkRenameDialog (Constructor)</h4> +<b>HgBookmarkRenameDialog</b>(<i>bookmarksList, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.__updateUI" ID="HgBookmarkRenameDialog.__updateUI"></a> +<h4>HgBookmarkRenameDialog.__updateUI</h4> +<b>__updateUI</b>(<i></i>) +<p> + Private slot to update the UI. +</p><a NAME="HgBookmarkRenameDialog.getData" ID="HgBookmarkRenameDialog.getData"></a> +<h4>HgBookmarkRenameDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the new and old bookmark names + (string, string) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged" ID="HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBookmarkRenameDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the selected bookmark. +</p><dl> +<dt><i>txt</i></dt> +<dd> +name of the selected bookmark (string) +</dd> +</dl><a NAME="HgBookmarkRenameDialog.on_nameEdit_textChanged" ID="HgBookmarkRenameDialog.on_nameEdit_textChanged"></a> +<h4>HgBookmarkRenameDialog.on_nameEdit_textChanged</h4> +<b>on_nameEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the bookmark name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog</title> +<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.BookmarksExtension.HgBookmarksInOutDialog</h1> +<p> +Module implementing a dialog to show a list of incoming or outgoing bookmarks. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarksInOutDialog">HgBookmarksInOutDialog</a></td> +<td>Class implementing a dialog to show a list of incoming or outgoing bookmarks.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarksInOutDialog" ID="HgBookmarksInOutDialog"></a> +<h2>HgBookmarksInOutDialog</h2> +<p> + Class implementing a dialog to show a list of incoming or outgoing bookmarks. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarksInOutDialog +<h3>Class Attributes</h3> +<table> +<tr><td>INCOMING</td></tr><tr><td>OUTGOING</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarksInOutDialog.__init__">HgBookmarksInOutDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a bookmark item in the bookmarks list.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.closeEvent">closeEvent</a></td> +<td>Private slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> +<td>Private slot called by a button of the button box clicked.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_input_returnPressed">on_input_returnPressed</a></td> +<td>Private slot to handle the press of the return key in the input field.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#HgBookmarksInOutDialog.start">start</a></td> +<td>Public slot to start the bookmarks command.</td> +</tr> +</table> +<a NAME="HgBookmarksInOutDialog.__init__" ID="HgBookmarksInOutDialog.__init__"></a> +<h4>HgBookmarksInOutDialog (Constructor)</h4> +<b>HgBookmarksInOutDialog</b>(<i>vcs, mode, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>mode</i></dt> +<dd> +mode of the dialog (HgBookmarksInOutDialog.INCOMING, + HgBookmarksInOutDialog.OUTGOING) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__finish" ID="HgBookmarksInOutDialog.__finish"></a> +<h4>HgBookmarksInOutDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed the button. +</p><a NAME="HgBookmarksInOutDialog.__generateItem" ID="HgBookmarksInOutDialog.__generateItem"></a> +<h4>HgBookmarksInOutDialog.__generateItem</h4> +<b>__generateItem</b>(<i>changeset, name</i>) +<p> + Private method to generate a bookmark item in the bookmarks list. +</p><dl> +<dt><i>changeset</i></dt> +<dd> +changeset of the bookmark (string) +</dd><dt><i>name</i></dt> +<dd> +name of the bookmark (string) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__procFinished" ID="HgBookmarksInOutDialog.__procFinished"></a> +<h4>HgBookmarksInOutDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.__readStderr" ID="HgBookmarksInOutDialog.__readStderr"></a> +<h4>HgBookmarksInOutDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="HgBookmarksInOutDialog.__readStdout" ID="HgBookmarksInOutDialog.__readStdout"></a> +<h4>HgBookmarksInOutDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="HgBookmarksInOutDialog.__resizeColumns" ID="HgBookmarksInOutDialog.__resizeColumns"></a> +<h4>HgBookmarksInOutDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="HgBookmarksInOutDialog.__resort" ID="HgBookmarksInOutDialog.__resort"></a> +<h4>HgBookmarksInOutDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="HgBookmarksInOutDialog.closeEvent" ID="HgBookmarksInOutDialog.closeEvent"></a> +<h4>HgBookmarksInOutDialog.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="HgBookmarksInOutDialog.keyPressEvent" ID="HgBookmarksInOutDialog.keyPressEvent"></a> +<h4>HgBookmarksInOutDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.on_buttonBox_clicked" ID="HgBookmarksInOutDialog.on_buttonBox_clicked"></a> +<h4>HgBookmarksInOutDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<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="HgBookmarksInOutDialog.on_input_returnPressed" ID="HgBookmarksInOutDialog.on_input_returnPressed"></a> +<h4>HgBookmarksInOutDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="HgBookmarksInOutDialog.on_passwordCheckBox_toggled" ID="HgBookmarksInOutDialog.on_passwordCheckBox_toggled"></a> +<h4>HgBookmarksInOutDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="HgBookmarksInOutDialog.on_sendButton_clicked" ID="HgBookmarksInOutDialog.on_sendButton_clicked"></a> +<h4>HgBookmarksInOutDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="HgBookmarksInOutDialog.start" ID="HgBookmarksInOutDialog.start"></a> +<h4>HgBookmarksInOutDialog.start</h4> +<b>start</b>(<i>path</i>) +<p> + Public slot to start the bookmarks command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog</title> +<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.BookmarksExtension.HgBookmarksListDialog</h1> +<p> +Module implementing a dialog to show a list of bookmarks. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgBookmarksListDialog">HgBookmarksListDialog</a></td> +<td>Class implementing a dialog to show a list of bookmarks.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgBookmarksListDialog" ID="HgBookmarksListDialog"></a> +<h2>HgBookmarksListDialog</h2> +<p> + Class implementing a dialog to show a list of bookmarks. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgBookmarksListDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgBookmarksListDialog.__init__">HgBookmarksListDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__generateItem">__generateItem</a></td> +<td>Private method to generate a bookmark item in the bookmarks list.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__procFinished">__procFinished</a></td> +<td>Private slot connected to the finished signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStderr signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__readStdout">__readStdout</a></td> +<td>Private slot to handle the readyReadStdout signal.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__resizeColumns">__resizeColumns</a></td> +<td>Private method to resize the list columns.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.__resort">__resort</a></td> +<td>Private method to resort the tree.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.closeEvent">closeEvent</a></td> +<td>Private slot implementing a close event handler.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.keyPressEvent">keyPressEvent</a></td> +<td>Protected slot to handle a key press event.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_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="#HgBookmarksListDialog.on_input_returnPressed">on_input_returnPressed</a></td> +<td>Private slot to handle the press of the return key in the input field.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> +<td>Private slot to handle the password checkbox toggled.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> +<td>Private slot to send the input to the subversion process.</td> +</tr><tr> +<td><a href="#HgBookmarksListDialog.start">start</a></td> +<td>Public slot to start the bookmarks command.</td> +</tr> +</table> +<a NAME="HgBookmarksListDialog.__init__" ID="HgBookmarksListDialog.__init__"></a> +<h4>HgBookmarksListDialog (Constructor)</h4> +<b>HgBookmarksListDialog</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="HgBookmarksListDialog.__finish" ID="HgBookmarksListDialog.__finish"></a> +<h4>HgBookmarksListDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed the button. +</p><a NAME="HgBookmarksListDialog.__generateItem" ID="HgBookmarksListDialog.__generateItem"></a> +<h4>HgBookmarksListDialog.__generateItem</h4> +<b>__generateItem</b>(<i>revision, changeset, status, name</i>) +<p> + Private method to generate a bookmark item in the bookmarks list. +</p><dl> +<dt><i>revision</i></dt> +<dd> +revision of the bookmark (string) +</dd><dt><i>changeset</i></dt> +<dd> +changeset of the bookmark (string) +</dd><dt><i>status</i></dt> +<dd> +of the bookmark (string) +</dd><dt><i>name</i></dt> +<dd> +name of the bookmark (string) +</dd> +</dl><a NAME="HgBookmarksListDialog.__procFinished" ID="HgBookmarksListDialog.__procFinished"></a> +<h4>HgBookmarksListDialog.__procFinished</h4> +<b>__procFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot connected to the finished signal. +</p><dl> +<dt><i>exitCode</i></dt> +<dd> +exit code of the process (integer) +</dd><dt><i>exitStatus</i></dt> +<dd> +exit status of the process (QProcess.ExitStatus) +</dd> +</dl><a NAME="HgBookmarksListDialog.__readStderr" ID="HgBookmarksListDialog.__readStderr"></a> +<h4>HgBookmarksListDialog.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStderr signal. +</p><p> + It reads the error output of the process and inserts it into the + error pane. +</p><a NAME="HgBookmarksListDialog.__readStdout" ID="HgBookmarksListDialog.__readStdout"></a> +<h4>HgBookmarksListDialog.__readStdout</h4> +<b>__readStdout</b>(<i></i>) +<p> + Private slot to handle the readyReadStdout signal. +</p><p> + It reads the output of the process, formats it and inserts it into + the contents pane. +</p><a NAME="HgBookmarksListDialog.__resizeColumns" ID="HgBookmarksListDialog.__resizeColumns"></a> +<h4>HgBookmarksListDialog.__resizeColumns</h4> +<b>__resizeColumns</b>(<i></i>) +<p> + Private method to resize the list columns. +</p><a NAME="HgBookmarksListDialog.__resort" ID="HgBookmarksListDialog.__resort"></a> +<h4>HgBookmarksListDialog.__resort</h4> +<b>__resort</b>(<i></i>) +<p> + Private method to resort the tree. +</p><a NAME="HgBookmarksListDialog.closeEvent" ID="HgBookmarksListDialog.closeEvent"></a> +<h4>HgBookmarksListDialog.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="HgBookmarksListDialog.keyPressEvent" ID="HgBookmarksListDialog.keyPressEvent"></a> +<h4>HgBookmarksListDialog.keyPressEvent</h4> +<b>keyPressEvent</b>(<i>evt</i>) +<p> + Protected slot to handle a key press event. +</p><dl> +<dt><i>evt</i></dt> +<dd> +the key press event (QKeyEvent) +</dd> +</dl><a NAME="HgBookmarksListDialog.on_buttonBox_clicked" ID="HgBookmarksListDialog.on_buttonBox_clicked"></a> +<h4>HgBookmarksListDialog.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="HgBookmarksListDialog.on_input_returnPressed" ID="HgBookmarksListDialog.on_input_returnPressed"></a> +<h4>HgBookmarksListDialog.on_input_returnPressed</h4> +<b>on_input_returnPressed</b>(<i></i>) +<p> + Private slot to handle the press of the return key in the input field. +</p><a NAME="HgBookmarksListDialog.on_passwordCheckBox_toggled" ID="HgBookmarksListDialog.on_passwordCheckBox_toggled"></a> +<h4>HgBookmarksListDialog.on_passwordCheckBox_toggled</h4> +<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) +<p> + Private slot to handle the password checkbox toggled. +</p><dl> +<dt><i>isOn</i></dt> +<dd> +flag indicating the status of the check box (boolean) +</dd> +</dl><a NAME="HgBookmarksListDialog.on_sendButton_clicked" ID="HgBookmarksListDialog.on_sendButton_clicked"></a> +<h4>HgBookmarksListDialog.on_sendButton_clicked</h4> +<b>on_sendButton_clicked</b>(<i></i>) +<p> + Private slot to send the input to the subversion process. +</p><a NAME="HgBookmarksListDialog.start" ID="HgBookmarksListDialog.start"></a> +<h4>HgBookmarksListDialog.start</h4> +<b>start</b>(<i>path, bookmarksList</i>) +<p> + Public slot to start the bookmarks command. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of directory to be listed (string) +</dd><dt><i>bookmarksList</i></dt> +<dd> +reference to string list receiving the bookmarks + (list of strings) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper</title> +<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.BookmarksExtension.ProjectHelper</h1> +<p> +Module implementing the bookmarks extension project helper. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#BookmarksProjectHelper">BookmarksProjectHelper</a></td> +<td>Class implementing the bookmarks extension project helper.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="BookmarksProjectHelper" ID="BookmarksProjectHelper"></a> +<h2>BookmarksProjectHelper</h2> +<p> + Class implementing the bookmarks extension project helper. +</p> +<h3>Derived from</h3> +QObject +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#BookmarksProjectHelper.__init__">BookmarksProjectHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkDefine">__hgBookmarkDefine</a></td> +<td>Private slot used to define a bookmark.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkDelete">__hgBookmarkDelete</a></td> +<td>Private slot used to delete a bookmark.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkIncoming">__hgBookmarkIncoming</a></td> +<td>Private slot used to show a list of incoming bookmarks.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkMove">__hgBookmarkMove</a></td> +<td>Private slot used to move a bookmark.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkOutgoing">__hgBookmarkOutgoing</a></td> +<td>Private slot used to show a list of outgoing bookmarks.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkPull">__hgBookmarkPull</a></td> +<td>Private slot used to pull a bookmark from a remote repository.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkPush">__hgBookmarkPush</a></td> +<td>Private slot used to push a bookmark to a remote repository.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarkRename">__hgBookmarkRename</a></td> +<td>Private slot used to rename a bookmark.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.__hgBookmarksList">__hgBookmarksList</a></td> +<td>Private slot used to list the bookmarks.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.getActions">getActions</a></td> +<td>Public method to get a list of all actions.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the VCS menu.</td> +</tr><tr> +<td><a href="#BookmarksProjectHelper.setObjects">setObjects</a></td> +<td>Public method to set references to the vcs and project objects.</td> +</tr> +</table> +<a NAME="BookmarksProjectHelper.__init__" ID="BookmarksProjectHelper.__init__"></a> +<h4>BookmarksProjectHelper (Constructor)</h4> +<b>BookmarksProjectHelper</b>(<i></i>) +<p> + Constructor +</p><a NAME="BookmarksProjectHelper.__hgBookmarkDefine" ID="BookmarksProjectHelper.__hgBookmarkDefine"></a> +<h4>BookmarksProjectHelper.__hgBookmarkDefine</h4> +<b>__hgBookmarkDefine</b>(<i></i>) +<p> + Private slot used to define a bookmark. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkDelete" ID="BookmarksProjectHelper.__hgBookmarkDelete"></a> +<h4>BookmarksProjectHelper.__hgBookmarkDelete</h4> +<b>__hgBookmarkDelete</b>(<i></i>) +<p> + Private slot used to delete a bookmark. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkIncoming" ID="BookmarksProjectHelper.__hgBookmarkIncoming"></a> +<h4>BookmarksProjectHelper.__hgBookmarkIncoming</h4> +<b>__hgBookmarkIncoming</b>(<i></i>) +<p> + Private slot used to show a list of incoming bookmarks. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkMove" ID="BookmarksProjectHelper.__hgBookmarkMove"></a> +<h4>BookmarksProjectHelper.__hgBookmarkMove</h4> +<b>__hgBookmarkMove</b>(<i></i>) +<p> + Private slot used to move a bookmark. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkOutgoing" ID="BookmarksProjectHelper.__hgBookmarkOutgoing"></a> +<h4>BookmarksProjectHelper.__hgBookmarkOutgoing</h4> +<b>__hgBookmarkOutgoing</b>(<i></i>) +<p> + Private slot used to show a list of outgoing bookmarks. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkPull" ID="BookmarksProjectHelper.__hgBookmarkPull"></a> +<h4>BookmarksProjectHelper.__hgBookmarkPull</h4> +<b>__hgBookmarkPull</b>(<i></i>) +<p> + Private slot used to pull a bookmark from a remote repository. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkPush" ID="BookmarksProjectHelper.__hgBookmarkPush"></a> +<h4>BookmarksProjectHelper.__hgBookmarkPush</h4> +<b>__hgBookmarkPush</b>(<i></i>) +<p> + Private slot used to push a bookmark to a remote repository. +</p><a NAME="BookmarksProjectHelper.__hgBookmarkRename" ID="BookmarksProjectHelper.__hgBookmarkRename"></a> +<h4>BookmarksProjectHelper.__hgBookmarkRename</h4> +<b>__hgBookmarkRename</b>(<i></i>) +<p> + Private slot used to rename a bookmark. +</p><a NAME="BookmarksProjectHelper.__hgBookmarksList" ID="BookmarksProjectHelper.__hgBookmarksList"></a> +<h4>BookmarksProjectHelper.__hgBookmarksList</h4> +<b>__hgBookmarksList</b>(<i></i>) +<p> + Private slot used to list the bookmarks. +</p><a NAME="BookmarksProjectHelper.getActions" ID="BookmarksProjectHelper.getActions"></a> +<h4>BookmarksProjectHelper.getActions</h4> +<b>getActions</b>(<i></i>) +<p> + Public method to get a list of all actions. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all actions (list of E5Action) +</dd> +</dl><a NAME="BookmarksProjectHelper.initActions" ID="BookmarksProjectHelper.initActions"></a> +<h4>BookmarksProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p><a NAME="BookmarksProjectHelper.initMenu" ID="BookmarksProjectHelper.initMenu"></a> +<h4>BookmarksProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the VCS menu. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the main menu (QMenu) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +populated menu (QMenu) +</dd> +</dl><a NAME="BookmarksProjectHelper.setObjects" ID="BookmarksProjectHelper.setObjects"></a> +<h4>BookmarksProjectHelper.setObjects</h4> +<b>setObjects</b>(<i>vcsObject, projectObject</i>) +<p> + Public method to set references to the vcs and project objects. +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks</title> +<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.BookmarksExtension.bookmarks</h1> +<p> +Module implementing the bookmarks extension interface. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Bookmarks">Bookmarks</a></td> +<td>Class implementing the bookmarks extension interface.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="Bookmarks" ID="Bookmarks"></a> +<h2>Bookmarks</h2> +<p> + Class implementing the bookmarks extension interface. +</p> +<h3>Derived from</h3> +QObject +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Bookmarks.__init__">Bookmarks</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Bookmarks.__getInOutBookmarks">__getInOutBookmarks</a></td> +<td>Public method to get the list of incoming or outgoing bookmarks.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkDefine">hgBookmarkDefine</a></td> +<td>Public method to define a bookmark.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkDelete">hgBookmarkDelete</a></td> +<td>Public method to delete a bookmark.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkIncoming">hgBookmarkIncoming</a></td> +<td>Public method to show a list of incoming bookmarks.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkMove">hgBookmarkMove</a></td> +<td>Public method to move a bookmark.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkOutgoing">hgBookmarkOutgoing</a></td> +<td>Public method to show a list of outgoing bookmarks.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkPull">hgBookmarkPull</a></td> +<td>Public method to pull a bookmark from a remote repository.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkPush">hgBookmarkPush</a></td> +<td>Public method to push a bookmark to a remote repository.</td> +</tr><tr> +<td><a href="#Bookmarks.hgBookmarkRename">hgBookmarkRename</a></td> +<td>Public method to rename a bookmark.</td> +</tr><tr> +<td><a href="#Bookmarks.hgGetBookmarksList">hgGetBookmarksList</a></td> +<td>Public method to get the list of bookmarks.</td> +</tr><tr> +<td><a href="#Bookmarks.hgListBookmarks">hgListBookmarks</a></td> +<td>Public method used to list the available bookmarks.</td> +</tr><tr> +<td><a href="#Bookmarks.shutdown">shutdown</a></td> +<td>Public method used to shutdown the bookmarks interface.</td> +</tr> +</table> +<a NAME="Bookmarks.__init__" ID="Bookmarks.__init__"></a> +<h4>Bookmarks (Constructor)</h4> +<b>Bookmarks</b>(<i>vcs</i>) +<p> + Constructor +</p><a NAME="Bookmarks.__getInOutBookmarks" ID="Bookmarks.__getInOutBookmarks"></a> +<h4>Bookmarks.__getInOutBookmarks</h4> +<b>__getInOutBookmarks</b>(<i>repodir, incoming</i>) +<p> + Public method to get the list of incoming or outgoing bookmarks. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd><dt><i>incoming</i></dt> +<dd> +flag indicating to get incoming bookmarks (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of bookmarks (list of string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkDefine" ID="Bookmarks.hgBookmarkDefine"></a> +<h4>Bookmarks.hgBookmarkDefine</h4> +<b>hgBookmarkDefine</b>(<i>name</i>) +<p> + Public method to define a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkDelete" ID="Bookmarks.hgBookmarkDelete"></a> +<h4>Bookmarks.hgBookmarkDelete</h4> +<b>hgBookmarkDelete</b>(<i>name</i>) +<p> + Public method to delete a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkIncoming" ID="Bookmarks.hgBookmarkIncoming"></a> +<h4>Bookmarks.hgBookmarkIncoming</h4> +<b>hgBookmarkIncoming</b>(<i>name</i>) +<p> + Public method to show a list of incoming bookmarks. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkMove" ID="Bookmarks.hgBookmarkMove"></a> +<h4>Bookmarks.hgBookmarkMove</h4> +<b>hgBookmarkMove</b>(<i>name</i>) +<p> + Public method to move a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkOutgoing" ID="Bookmarks.hgBookmarkOutgoing"></a> +<h4>Bookmarks.hgBookmarkOutgoing</h4> +<b>hgBookmarkOutgoing</b>(<i>name</i>) +<p> + Public method to show a list of outgoing bookmarks. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkPull" ID="Bookmarks.hgBookmarkPull"></a> +<h4>Bookmarks.hgBookmarkPull</h4> +<b>hgBookmarkPull</b>(<i>name</i>) +<p> + Public method to pull a bookmark from a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkPush" ID="Bookmarks.hgBookmarkPush"></a> +<h4>Bookmarks.hgBookmarkPush</h4> +<b>hgBookmarkPush</b>(<i>name</i>) +<p> + Public method to push a bookmark to a remote repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgBookmarkRename" ID="Bookmarks.hgBookmarkRename"></a> +<h4>Bookmarks.hgBookmarkRename</h4> +<b>hgBookmarkRename</b>(<i>name</i>) +<p> + Public method to rename a bookmark. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name (string) +</dd> +</dl><a NAME="Bookmarks.hgGetBookmarksList" ID="Bookmarks.hgGetBookmarksList"></a> +<h4>Bookmarks.hgGetBookmarksList</h4> +<b>hgGetBookmarksList</b>(<i>repodir</i>) +<p> + Public method to get the list of bookmarks. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of bookmarks (list of string) +</dd> +</dl><a NAME="Bookmarks.hgListBookmarks" ID="Bookmarks.hgListBookmarks"></a> +<h4>Bookmarks.hgListBookmarks</h4> +<b>hgListBookmarks</b>(<i>path</i>) +<p> + Public method used to list the available bookmarks. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><a NAME="Bookmarks.shutdown" ID="Bookmarks.shutdown"></a> +<h4>Bookmarks.shutdown</h4> +<b>shutdown</b>(<i></i>) +<p> + Public method used to shutdown the bookmarks interface. +</p> +<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.HgBackoutDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html Sun May 08 15:19:58 2011 +0200 @@ -57,16 +57,43 @@ <td><a href="#HgBackoutDialog.__init__">HgBackoutDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgBackoutDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> <td><a href="#HgBackoutDialog.getParameters">getParameters</a></td> <td>Public method to retrieve the backout data.</td> </tr><tr> +<td><a href="#HgBackoutDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> <td><a href="#HgBackoutDialog.on_noneButton_toggled">on_noneButton_toggled</a></td> <td>Private slot to handle the toggling of the None revision button.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgBackoutDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> </tr> </table> <a NAME="HgBackoutDialog.__init__" ID="HgBackoutDialog.__init__"></a> <h4>HgBackoutDialog (Constructor)</h4> -<b>HgBackoutDialog</b>(<i>tagsList, branchesList, parent=None</i>) +<b>HgBackoutDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) <p> Constructor </p><dl> @@ -76,11 +103,19 @@ </dd><dt><i>branchesList</i></dt> <dd> list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget) </dd> -</dl><a NAME="HgBackoutDialog.getParameters" ID="HgBackoutDialog.getParameters"></a> +</dl><a NAME="HgBackoutDialog.__updateOK" ID="HgBackoutDialog.__updateOK"></a> +<h4>HgBackoutDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgBackoutDialog.getParameters" ID="HgBackoutDialog.getParameters"></a> <h4>HgBackoutDialog.getParameters</h4> <b>getParameters</b>(<i></i>) <p> @@ -92,6 +127,66 @@ merge, the commit date, the commit user and a commit message (string, boolean, string, string, string) </dd> +</dl><a NAME="HgBackoutDialog.on_bookmarkButton_toggled" ID="HgBackoutDialog.on_bookmarkButton_toggled"></a> +<h4>HgBackoutDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBackoutDialog.on_bookmarkCombo_editTextChanged" ID="HgBackoutDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBackoutDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBackoutDialog.on_branchButton_toggled" ID="HgBackoutDialog.on_branchButton_toggled"></a> +<h4>HgBackoutDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBackoutDialog.on_branchCombo_editTextChanged" ID="HgBackoutDialog.on_branchCombo_editTextChanged"></a> +<h4>HgBackoutDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBackoutDialog.on_idButton_toggled" ID="HgBackoutDialog.on_idButton_toggled"></a> +<h4>HgBackoutDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBackoutDialog.on_idEdit_textChanged" ID="HgBackoutDialog.on_idEdit_textChanged"></a> +<h4>HgBackoutDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> </dl><a NAME="HgBackoutDialog.on_noneButton_toggled" ID="HgBackoutDialog.on_noneButton_toggled"></a> <h4>HgBackoutDialog.on_noneButton_toggled</h4> <b>on_noneButton_toggled</b>(<i>checked</i>) @@ -102,6 +197,26 @@ <dd> flag indicating the checked state (boolean) </dd> +</dl><a NAME="HgBackoutDialog.on_tagButton_toggled" ID="HgBackoutDialog.on_tagButton_toggled"></a> +<h4>HgBackoutDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBackoutDialog.on_tagCombo_editTextChanged" ID="HgBackoutDialog.on_tagCombo_editTextChanged"></a> +<h4>HgBackoutDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Sun May 08 15:19:58 2011 +0200 @@ -57,13 +57,40 @@ <td><a href="#HgBundleDialog.__init__">HgBundleDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgBundleDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> <td><a href="#HgBundleDialog.getParameters">getParameters</a></td> <td>Public method to retrieve the bundle data.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgBundleDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> </tr> </table> <a NAME="HgBundleDialog.__init__" ID="HgBundleDialog.__init__"></a> <h4>HgBundleDialog (Constructor)</h4> -<b>HgBundleDialog</b>(<i>tagsList, branchesList, parent=None</i>) +<b>HgBundleDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) <p> Constructor </p><dl> @@ -73,11 +100,19 @@ </dd><dt><i>branchesList</i></dt> <dd> list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget) </dd> -</dl><a NAME="HgBundleDialog.getParameters" ID="HgBundleDialog.getParameters"></a> +</dl><a NAME="HgBundleDialog.__updateOK" ID="HgBundleDialog.__updateOK"></a> +<h4>HgBundleDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgBundleDialog.getParameters" ID="HgBundleDialog.getParameters"></a> <h4>HgBundleDialog.getParameters</h4> <b>getParameters</b>(<i></i>) <p> @@ -88,6 +123,86 @@ tuple naming the revision, the compression type and a flag indicating to bundle all changesets (string, string, boolean) </dd> +</dl><a NAME="HgBundleDialog.on_bookmarkButton_toggled" ID="HgBundleDialog.on_bookmarkButton_toggled"></a> +<h4>HgBundleDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBundleDialog.on_bookmarkCombo_editTextChanged" ID="HgBundleDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgBundleDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBundleDialog.on_branchButton_toggled" ID="HgBundleDialog.on_branchButton_toggled"></a> +<h4>HgBundleDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBundleDialog.on_branchCombo_editTextChanged" ID="HgBundleDialog.on_branchCombo_editTextChanged"></a> +<h4>HgBundleDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgBundleDialog.on_idButton_toggled" ID="HgBundleDialog.on_idButton_toggled"></a> +<h4>HgBundleDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBundleDialog.on_idEdit_textChanged" ID="HgBundleDialog.on_idEdit_textChanged"></a> +<h4>HgBundleDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgBundleDialog.on_tagButton_toggled" ID="HgBundleDialog.on_tagButton_toggled"></a> +<h4>HgBundleDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgBundleDialog.on_tagCombo_editTextChanged" ID="HgBundleDialog.on_tagCombo_editTextChanged"></a> +<h4>HgBundleDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun May 08 15:19:58 2011 +0200 @@ -324,7 +324,7 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__generateLogItem" ID="HgLogBrowserDialog.__generateLogItem"></a> <h4>HgLogBrowserDialog.__generateLogItem</h4> -<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags</i>) +<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, bookmarks=None</i>) <p> Private method to generate a log tree entry. </p><dl> @@ -353,6 +353,9 @@ </dd><dt><i>tags</i></dt> <dd> list of tags (string) +</dd><dt><i>bookmarks</i></dt> +<dd> +list of bookmarks (string) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Sun May 08 15:19:58 2011 +0200 @@ -57,13 +57,40 @@ <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> <td>Public method to retrieve the merge data.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> </tr> </table> <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> <h4>HgMergeDialog (Constructor)</h4> -<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent=None</i>) +<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, bookmarksList=None, parent=None</i>) <p> Constructor </p><dl> @@ -76,11 +103,19 @@ </dd><dt><i>branchesList</i></dt> <dd> list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) </dd><dt><i>parent</i></dt> <dd> parent widget (QWidget) </dd> -</dl><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> +</dl><a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> +<h4>HgMergeDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> <h4>HgMergeDialog.getParameters</h4> <b>getParameters</b>(<i></i>) <p> @@ -91,6 +126,86 @@ tuple naming the revision and a flag indicating a forced merge (string, boolean) </dd> +</dl><a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a> +<h4>HgMergeDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a> +<h4>HgMergeDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a> +<h4>HgMergeDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a> +<h4>HgMergeDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a> +<h4>HgMergeDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a> +<h4>HgMergeDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a> +<h4>HgMergeDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Sun May 08 15:19:58 2011 +0200 @@ -57,13 +57,40 @@ <td><a href="#HgRevisionSelectionDialog.__init__">HgRevisionSelectionDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#HgRevisionSelectionDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> <td><a href="#HgRevisionSelectionDialog.getRevision">getRevision</a></td> <td>Public method to retrieve the selected revision.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_idButton_toggled">on_idButton_toggled</a></td> +<td>Private slot to handle changes of the ID select button.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> +<td>Private slot to handle changes of the ID edit.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> </tr> </table> <a NAME="HgRevisionSelectionDialog.__init__" ID="HgRevisionSelectionDialog.__init__"></a> <h4>HgRevisionSelectionDialog (Constructor)</h4> -<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, showNone=False, parent=None</i>) +<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, showNone=False, parent=None</i>) <p> Constructor </p><dl> @@ -73,6 +100,9 @@ </dd><dt><i>branchesList</i></dt> <dd> list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) </dd><dt><i>showNone</i></dt> <dd> flag influencing the label of the 'None' selection (boolean) @@ -80,7 +110,12 @@ <dd> parent widget (QWidget) </dd> -</dl><a NAME="HgRevisionSelectionDialog.getRevision" ID="HgRevisionSelectionDialog.getRevision"></a> +</dl><a NAME="HgRevisionSelectionDialog.__updateOK" ID="HgRevisionSelectionDialog.__updateOK"></a> +<h4>HgRevisionSelectionDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgRevisionSelectionDialog.getRevision" ID="HgRevisionSelectionDialog.getRevision"></a> <h4>HgRevisionSelectionDialog.getRevision</h4> <b>getRevision</b>(<i></i>) <p> @@ -88,8 +123,87 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple naming the revision and a flag indicating a - forced merge (string, boolean) +selected revision (string) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgRevisionSelectionDialog.on_bookmarkButton_toggled"></a> +<h4>HgRevisionSelectionDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ID="HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_branchButton_toggled" ID="HgRevisionSelectionDialog.on_branchButton_toggled"></a> +<h4>HgRevisionSelectionDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="HgRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> +<h4>HgRevisionSelectionDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_idButton_toggled" ID="HgRevisionSelectionDialog.on_idButton_toggled"></a> +<h4>HgRevisionSelectionDialog.on_idButton_toggled</h4> +<b>on_idButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_idEdit_textChanged" ID="HgRevisionSelectionDialog.on_idEdit_textChanged"></a> +<h4>HgRevisionSelectionDialog.on_idEdit_textChanged</h4> +<b>on_idEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_tagButton_toggled" ID="HgRevisionSelectionDialog.on_tagButton_toggled"></a> +<h4>HgRevisionSelectionDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="HgRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> +<h4>HgRevisionSelectionDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html Sun May 08 15:19:58 2011 +0200 @@ -60,13 +60,64 @@ <td><a href="#HgRevisionsSelectionDialog.__getRevision">__getRevision</a></td> <td>Private method to generate the revision.</td> </tr><tr> +<td><a href="#HgRevisionsSelectionDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> <td><a href="#HgRevisionsSelectionDialog.getRevisions">getRevisions</a></td> <td>Public method to get the revisions.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_bookmark1Button_toggled">on_bookmark1Button_toggled</a></td> +<td>Private slot to handle changes of the Bookmark1 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged">on_bookmark1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark1 combo.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_bookmark2Button_toggled">on_bookmark2Button_toggled</a></td> +<td>Private slot to handle changes of the Bookmark2 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged">on_bookmark2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark2 combo.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_branch1Button_toggled">on_branch1Button_toggled</a></td> +<td>Private slot to handle changes of the Branch1 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged">on_branch1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch1 combo.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_branch2Button_toggled">on_branch2Button_toggled</a></td> +<td>Private slot to handle changes of the Branch2 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged">on_branch2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch2 combo.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_id1Button_toggled">on_id1Button_toggled</a></td> +<td>Private slot to handle changes of the ID1 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_id1Edit_textChanged">on_id1Edit_textChanged</a></td> +<td>Private slot to handle changes of the ID1 edit.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_id2Button_toggled">on_id2Button_toggled</a></td> +<td>Private slot to handle changes of the ID2 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_id2Edit_textChanged">on_id2Edit_textChanged</a></td> +<td>Private slot to handle changes of the ID2 edit.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_tag1Button_toggled">on_tag1Button_toggled</a></td> +<td>Private slot to handle changes of the Tag1 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag1 combo.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_tag2Button_toggled">on_tag2Button_toggled</a></td> +<td>Private slot to handle changes of the Tag2 select button.</td> +</tr><tr> +<td><a href="#HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag2 combo.</td> </tr> </table> <a NAME="HgRevisionsSelectionDialog.__init__" ID="HgRevisionsSelectionDialog.__init__"></a> <h4>HgRevisionsSelectionDialog (Constructor)</h4> -<b>HgRevisionsSelectionDialog</b>(<i>tagsList, branchesList, parent=None</i>) +<b>HgRevisionsSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) <p> Constructor </p><dl> @@ -76,6 +127,9 @@ </dd><dt><i>branchesList</i></dt> <dd> list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) </dd><dt><i>parent</i></dt> <dd> parent widget of the dialog (QWidget) @@ -95,7 +149,12 @@ <dd> revision (string) </dd> -</dl><a NAME="HgRevisionsSelectionDialog.getRevisions" ID="HgRevisionsSelectionDialog.getRevisions"></a> +</dl><a NAME="HgRevisionsSelectionDialog.__updateOK" ID="HgRevisionsSelectionDialog.__updateOK"></a> +<h4>HgRevisionsSelectionDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgRevisionsSelectionDialog.getRevisions" ID="HgRevisionsSelectionDialog.getRevisions"></a> <h4>HgRevisionsSelectionDialog.getRevisions</h4> <b>getRevisions</b>(<i></i>) <p> @@ -105,6 +164,166 @@ <dd> list two strings </dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_bookmark1Button_toggled" ID="HgRevisionsSelectionDialog.on_bookmark1Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_bookmark1Button_toggled</h4> +<b>on_bookmark1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_bookmark1Combo_editTextChanged</h4> +<b>on_bookmark1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_bookmark2Button_toggled" ID="HgRevisionsSelectionDialog.on_bookmark2Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_bookmark2Button_toggled</h4> +<b>on_bookmark2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_bookmark2Combo_editTextChanged</h4> +<b>on_bookmark2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_branch1Button_toggled" ID="HgRevisionsSelectionDialog.on_branch1Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_branch1Button_toggled</h4> +<b>on_branch1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_branch1Combo_editTextChanged</h4> +<b>on_branch1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_branch2Button_toggled" ID="HgRevisionsSelectionDialog.on_branch2Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_branch2Button_toggled</h4> +<b>on_branch2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_branch2Combo_editTextChanged</h4> +<b>on_branch2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_id1Button_toggled" ID="HgRevisionsSelectionDialog.on_id1Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_id1Button_toggled</h4> +<b>on_id1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_id1Edit_textChanged" ID="HgRevisionsSelectionDialog.on_id1Edit_textChanged"></a> +<h4>HgRevisionsSelectionDialog.on_id1Edit_textChanged</h4> +<b>on_id1Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID1 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_id2Button_toggled" ID="HgRevisionsSelectionDialog.on_id2Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_id2Button_toggled</h4> +<b>on_id2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_id2Edit_textChanged" ID="HgRevisionsSelectionDialog.on_id2Edit_textChanged"></a> +<h4>HgRevisionsSelectionDialog.on_id2Edit_textChanged</h4> +<b>on_id2Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID2 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_tag1Button_toggled" ID="HgRevisionsSelectionDialog.on_tag1Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_tag1Button_toggled</h4> +<b>on_tag1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_tag1Combo_editTextChanged</h4> +<b>on_tag1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_tag2Button_toggled" ID="HgRevisionsSelectionDialog.on_tag2Button_toggled"></a> +<h4>HgRevisionsSelectionDialog.on_tag2Button_toggled</h4> +<b>on_tag2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged" ID="HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged"></a> +<h4>HgRevisionsSelectionDialog.on_tag2Combo_editTextChanged</h4> +<b>on_tag2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun May 08 15:19:58 2011 +0200 @@ -168,6 +168,9 @@ <td><a href="#HgProjectHelper.__hgVerify">__hgVerify</a></td> <td>Private slot used to verify the integrity of the repository.</td> </tr><tr> +<td><a href="#HgProjectHelper.__showExtensionMenu">__showExtensionMenu</a></td> +<td>Private slot showing the extensions menu.</td> +</tr><tr> <td><a href="#HgProjectHelper.getActions">getActions</a></td> <td>Public method to get a list of all actions.</td> </tr><tr> @@ -176,6 +179,9 @@ </tr><tr> <td><a href="#HgProjectHelper.initMenu">initMenu</a></td> <td>Public method to generate the VCS menu.</td> +</tr><tr> +<td><a href="#HgProjectHelper.setObjects">setObjects</a></td> +<td>Public method to set references to the vcs and project objects.</td> </tr> </table> <a NAME="HgProjectHelper.__init__" ID="HgProjectHelper.__init__"></a> @@ -383,6 +389,11 @@ <b>__hgVerify</b>(<i></i>) <p> Private slot used to verify the integrity of the repository. +</p><a NAME="HgProjectHelper.__showExtensionMenu" ID="HgProjectHelper.__showExtensionMenu"></a> +<h4>HgProjectHelper.__showExtensionMenu</h4> +<b>__showExtensionMenu</b>(<i></i>) +<p> + Private slot showing the extensions menu. </p><a NAME="HgProjectHelper.getActions" ID="HgProjectHelper.getActions"></a> <h4>HgProjectHelper.getActions</h4> <b>getActions</b>(<i></i>) @@ -408,6 +419,19 @@ <dd> reference to the menu to be populated (QMenu) </dd> +</dl><a NAME="HgProjectHelper.setObjects" ID="HgProjectHelper.setObjects"></a> +<h4>HgProjectHelper.setObjects</h4> +<b>setObjects</b>(<i>vcsObject, projectObject</i>) +<p> + Public method to set references to the vcs and project objects. +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun May 08 15:19:58 2011 +0200 @@ -63,9 +63,18 @@ <td><a href="#Hg.__init__">Hg</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#Hg.__getExtensionsInfo">__getExtensionsInfo</a></td> +<td>Private method to get the active extensions from Mercurial.</td> +</tr><tr> <td><a href="#Hg.__hgURL">__hgURL</a></td> <td>Private method to format a url for Mercurial.</td> </tr><tr> +<td><a href="#Hg.__iniFileChanged">__iniFileChanged</a></td> +<td>Private slot to handle a change of the Mercurial config file.</td> +</tr><tr> +<td><a href="#Hg.__monitorRepoIniFile">__monitorRepoIniFile</a></td> +<td>Private slot to add a repository config file to the list of monitored files.</td> +</tr><tr> <td><a href="#Hg.__vcsCommit_Step2">__vcsCommit_Step2</a></td> <td>Private slot performing the second step of the commit action.</td> </tr><tr> @@ -75,6 +84,9 @@ <td><a href="#Hg.clearStatusCache">clearStatusCache</a></td> <td>Public method to clear the status cache.</td> </tr><tr> +<td><a href="#Hg.getExtensionObject">getExtensionObject</a></td> +<td>Public method to get a reference to an extension object.</td> +</tr><tr> <td><a href="#Hg.getPlugin">getPlugin</a></td> <td>Public method to get a reference to the plugin object.</td> </tr><tr> @@ -108,6 +120,12 @@ <td><a href="#Hg.hgForget">hgForget</a></td> <td>Public method used to remove a file from the Mercurial repository.</td> </tr><tr> +<td><a href="#Hg.hgGetBranchesList">hgGetBranchesList</a></td> +<td>Public method to get the list of branches.</td> +</tr><tr> +<td><a href="#Hg.hgGetTagsList">hgGetTagsList</a></td> +<td>Public method to get the list of tags.</td> +</tr><tr> <td><a href="#Hg.hgIdentify">hgIdentify</a></td> <td>Public method to identify the current working directory.</td> </tr><tr> @@ -171,6 +189,9 @@ <td><a href="#Hg.hgVerify">hgVerify</a></td> <td>Public method to verify the integrity of the repository.</td> </tr><tr> +<td><a href="#Hg.isExtensionActive">isExtensionActive</a></td> +<td>Public method to check, if an extension is active.</td> +</tr><tr> <td><a href="#Hg.vcsAdd">vcsAdd</a></td> <td>Public method used to add a file/directory to the Mercurial repository.</td> </tr><tr> @@ -208,10 +229,10 @@ <td>Public method used to export a directory from the Subversion repository.</td> </tr><tr> <td><a href="#Hg.vcsGetProjectBrowserHelper">vcsGetProjectBrowserHelper</a></td> -<td>Public method to instanciate a helper object for the different project browsers.</td> +<td>Public method to instantiate a helper object for the different project browsers.</td> </tr><tr> <td><a href="#Hg.vcsGetProjectHelper">vcsGetProjectHelper</a></td> -<td>Public method to instanciate a helper object for the project.</td> +<td>Public method to instantiate a helper object for the project.</td> </tr><tr> <td><a href="#Hg.vcsImport">vcsImport</a></td> <td>Public method used to import the project into the Subversion repository.</td> @@ -281,7 +302,12 @@ <dd> name of this object (string) </dd> -</dl><a NAME="Hg.__hgURL" ID="Hg.__hgURL"></a> +</dl><a NAME="Hg.__getExtensionsInfo" ID="Hg.__getExtensionsInfo"></a> +<h4>Hg.__getExtensionsInfo</h4> +<b>__getExtensionsInfo</b>(<i></i>) +<p> + Private method to get the active extensions from Mercurial. +</p><a NAME="Hg.__hgURL" ID="Hg.__hgURL"></a> <h4>Hg.__hgURL</h4> <b>__hgURL</b>(<i>url</i>) <p> @@ -296,6 +322,26 @@ <dd> properly formated url for subversion (string) </dd> +</dl><a NAME="Hg.__iniFileChanged" ID="Hg.__iniFileChanged"></a> +<h4>Hg.__iniFileChanged</h4> +<b>__iniFileChanged</b>(<i>path</i>) +<p> + Private slot to handle a change of the Mercurial config file. +</p><dl> +<dt><i>path</i></dt> +<dd> +name of the changed file (string) +</dd> +</dl><a NAME="Hg.__monitorRepoIniFile" ID="Hg.__monitorRepoIniFile"></a> +<h4>Hg.__monitorRepoIniFile</h4> +<b>__monitorRepoIniFile</b>(<i>name</i>) +<p> + Private slot to add a repository config file to the list of monitored files. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name pointing into the repository (string) +</dd> </dl><a NAME="Hg.__vcsCommit_Step2" ID="Hg.__vcsCommit_Step2"></a> <h4>Hg.__vcsCommit_Step2</h4> <b>__vcsCommit_Step2</b>(<i></i>) @@ -324,7 +370,22 @@ <b>clearStatusCache</b>(<i></i>) <p> Public method to clear the status cache. -</p><a NAME="Hg.getPlugin" ID="Hg.getPlugin"></a> +</p><a NAME="Hg.getExtensionObject" ID="Hg.getExtensionObject"></a> +<h4>Hg.getExtensionObject</h4> +<b>getExtensionObject</b>(<i>extensionName</i>) +<p> + Public method to get a reference to an extension object. +</p><dl> +<dt><i>extensionName</i></dt> +<dd> +name of the extension (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the extension object (boolean) +</dd> +</dl><a NAME="Hg.getPlugin" ID="Hg.getPlugin"></a> <h4>Hg.getPlugin</h4> <b>getPlugin</b>(<i></i>) <p> @@ -463,6 +524,36 @@ <dd> file/directory name to be removed (string or list of strings)) </dd> +</dl><a NAME="Hg.hgGetBranchesList" ID="Hg.hgGetBranchesList"></a> +<h4>Hg.hgGetBranchesList</h4> +<b>hgGetBranchesList</b>(<i>repodir</i>) +<p> + Public method to get the list of branches. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of branches (list of string) +</dd> +</dl><a NAME="Hg.hgGetTagsList" ID="Hg.hgGetTagsList"></a> +<h4>Hg.hgGetTagsList</h4> +<b>hgGetTagsList</b>(<i>repodir</i>) +<p> + Public method to get the list of tags. +</p><dl> +<dt><i>repodir</i></dt> +<dd> +directory name of the repository (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tags (list of string) +</dd> </dl><a NAME="Hg.hgIdentify" ID="Hg.hgIdentify"></a> <h4>Hg.hgIdentify</h4> <b>hgIdentify</b>(<i>name</i>) @@ -702,6 +793,21 @@ <dd> file/directory name (string) </dd> +</dl><a NAME="Hg.isExtensionActive" ID="Hg.isExtensionActive"></a> +<h4>Hg.isExtensionActive</h4> +<b>isExtensionActive</b>(<i>extensionName</i>) +<p> + Public method to check, if an extension is active. +</p><dl> +<dt><i>extensionName</i></dt> +<dd> +name of the extension to check for (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating an active extension (boolean) +</dd> </dl><a NAME="Hg.vcsAdd" ID="Hg.vcsAdd"></a> <h4>Hg.vcsAdd</h4> <b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) @@ -889,7 +995,7 @@ <h4>Hg.vcsGetProjectBrowserHelper</h4> <b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) <p> - Public method to instanciate a helper object for the different project browsers. + Public method to instantiate a helper object for the different project browsers. </p><dl> <dt><i>browser</i></dt> <dd> @@ -911,7 +1017,7 @@ <h4>Hg.vcsGetProjectHelper</h4> <b>vcsGetProjectHelper</b>(<i>project</i>) <p> - Public method to instanciate a helper object for the project. + Public method to instantiate a helper object for the project. </p><dl> <dt><i>project</i></dt> <dd>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html Sun May 08 15:19:58 2011 +0200 @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension</h1> +<p> +Package implementing the bookmarks extension support interface. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkDialog.html">HgBookmarkDialog</a></td> +<td>Module implementing the bookmark dialog.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarkRenameDialog.html">HgBookmarkRenameDialog</a></td> +<td>Module implementing a dialog to get the data to rename a bookmark.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksInOutDialog.html">HgBookmarksInOutDialog</a></td> +<td>Module implementing a dialog to show a list of incoming or outgoing bookmarks.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.HgBookmarksListDialog.html">HgBookmarksListDialog</a></td> +<td>Module implementing a dialog to show a list of bookmarks.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the bookmarks extension project helper.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html">bookmarks</a></td> +<td>Module implementing the bookmarks extension interface.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun May 08 13:56:12 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun May 08 15:19:58 2011 +0200 @@ -31,6 +31,9 @@ <h3>Packages</h3> <table> <tr> +<td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html">BookmarksExtension</a></td> +<td>Package implementing the bookmarks extension support interface.</td> +</tr><tr> <td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html">ConfigurationPage</a></td> <td>Package implementing the the Mercurial configuration page.</td> </tr>
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Sun May 08 13:56:12 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Sun May 08 15:19:58 2011 +0200 @@ -39,8 +39,10 @@ if mode == self.MOVE_MODE: self.nameEdit.hide() self.nameCombo.addItems([""] + sorted(bookmarksList)) + self.setWindowTitle(self.trUtf8("Move Bookmark")) else: self.nameCombo.hide() + self.setWindowTitle(self.trUtf8("Define Bookmark")) self.__bookmarksList = bookmarksList[:]
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui Sun May 08 13:56:12 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui Sun May 08 15:19:58 2011 +0200 @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Define Bookmark</string> + <string/> </property> <property name="sizeGripEnabled"> <bool>true</bool>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun May 08 13:56:12 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun May 08 15:19:58 2011 +0200 @@ -2199,7 +2199,7 @@ """ Private slot to handle a change of the Mercurial config file. - @path path name of the changed file (string) + @param path name of the changed file (string) """ self.__getExtensionsInfo()
--- a/changelog Sun May 08 13:56:12 2011 +0200 +++ b/changelog Sun May 08 15:19:58 2011 +0200 @@ -1,5 +1,9 @@ Change Log ---------- +Version 5.2-snapshot-2011mmdd: +- bug fixes +- added support for bookmarks to the Mercurial interface + Version 5.2-snapshot-20110501: - bug fixes - added menu entry for the icon editor to the tray starter
--- a/i18n/eric5_cs.ts Sun May 08 13:56:12 2011 +0200 +++ b/i18n/eric5_cs.ts Sun May 08 15:19:58 2011 +0200 @@ -1378,6 +1378,69 @@ </message> </context> <context> + <name>Bookmarks</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="121"/> + <source>Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/> + <source>Delete Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/> + <source>Select the bookmark to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="151"/> + <source>Delete Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="179"/> + <source>Rename Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="212"/> + <source>Move Mercurial Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/> + <source>Pull Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/> + <source>Select the bookmark to be pulled:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="301"/> + <source>Pulling bookmark from a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/> + <source>Push Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/> + <source>Select the bookmark to be push:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="333"/> + <source>Pushing bookmark to a remote Mercurial repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>BookmarksDialog</name> <message> <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="14"/> @@ -1598,6 +1661,174 @@ </message> </context> <context> + <name>BookmarksProjectHelper</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="58"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="61"/> + <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/BookmarksExtension/ProjectHelper.py" line="68"/> + <source>Define bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> + <source>Define bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="72"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="75"/> + <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/BookmarksExtension/ProjectHelper.py" line="82"/> + <source>Delete bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> + <source>Delete bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="86"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/> + <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/BookmarksExtension/ProjectHelper.py" line="96"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="100"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="103"/> + <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/BookmarksExtension/ProjectHelper.py" line="110"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="114"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="117"/> + <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/BookmarksExtension/ProjectHelper.py" line="124"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="128"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="131"/> + <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/BookmarksExtension/ProjectHelper.py" line="139"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="143"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="146"/> + <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/BookmarksExtension/ProjectHelper.py" line="154"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="158"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="161"/> + <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/BookmarksExtension/ProjectHelper.py" line="169"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="173"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="176"/> + <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/BookmarksExtension/ProjectHelper.py" line="191"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> +</context> +<context> <name>BookmarksToolBar</name> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="39"/> @@ -3468,42 +3699,42 @@ <translation>&Filtr pro:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="396"/> + <location filename="Project/CreateDialogCodeDialog.py" line="401"/> <source>Code Generation</source> <translation>Generování kódu</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="262"/> + <location filename="Project/CreateDialogCodeDialog.py" line="267"/> <source>uic error</source> <translation>uic chyba</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="90"/> + <location filename="Project/CreateDialogCodeDialog.py" line="95"/> <source>Create Dialog Code</source> <translation>Vytvořit Dialog Code</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="90"/> + <location filename="Project/CreateDialogCodeDialog.py" line="95"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Soubor <b>{0}</b> existuje ale neobsahuje žádné třídy.</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="262"/> + <location filename="Project/CreateDialogCodeDialog.py" line="267"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Byla nalezena chyba načtená z <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="304"/> + <location filename="Project/CreateDialogCodeDialog.py" line="309"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Template soubor <b>{0}</b> nelze otevřít.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="337"/> + <location filename="Project/CreateDialogCodeDialog.py" line="342"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Nelze ovevřít source soubor "{0}".</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="396"/> + <location filename="Project/CreateDialogCodeDialog.py" line="401"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Nelze zapsat do source souboru "{0}".</p><p>Důvod: {1}</p></translation> </message> @@ -15084,212 +15315,212 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="197"/> <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="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="200"/> <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="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <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="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="255"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="270"/> <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="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="311"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> <source>Commiting changes to Mercurial repository</source> <translation>Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="455"/> <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="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> <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="541"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> <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="599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="621"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="804"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="981"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1023"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1200"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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="1354"/> - <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="1463"/> - <source>Resolving files/directories</source> - <translation>Vyřešení souborů/složek</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> + <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="1599"/> + <source>Resolving files/directories</source> + <translation>Vyřešení souborů/složek</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/> <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="1567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="1519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1911"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15299,37 +15530,37 @@ <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="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1973"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <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="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1889"/> <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="2014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2166"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -15495,64 +15726,414 @@ <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>Select to not specify a specific revision</source> <translation>Vybrat pro specifikaci konkrétní revize</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <source>Commit data</source> + <translation>Zapsat změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <source>Commit message:</source> + <translation>Zpráva zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation>Zadejte zprávu pro zápis změn (commit) nebo ponechte prázdné pro použití výhozí hodnoty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <source>Commit Date:</source> + <translation>Datum zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <source>Enter optional date for the commit</source> + <translation>Zadejte nepovinné datum pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <source>Commit User:</source> + <translation>Autor zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <source>Enter optional user for the commit</source> + <translation>Zadejte nepovinného uživatele pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> + <source>Select to merge with parent of the project directory</source> + <translation>Vybrat pro merge s rodičem složky projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> + <source>Merge with current parent</source> + <translation>Merge s aktuálním rodičem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="173"/> + <source>Backed out changeset <{0}>.</source> + <translation>Zálohovat množinu změn <{0}>.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> - <source>Commit data</source> - <translation>Zapsat změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> - <source>Commit message:</source> - <translation>Zpráva zápisu změn:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Enter the commit message or leave empty to use the default one</source> - <translation>Zadejte zprávu pro zápis změn (commit) nebo ponechte prázdné pro použití výhozí hodnoty</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> - <source>Commit Date:</source> - <translation>Datum zápisu změn:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> - <source>Enter optional date for the commit</source> - <translation>Zadejte nepovinné datum pro zápis změn (commit)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> - <source>Commit User:</source> - <translation>Autor zápisu změn:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> - <source>Enter optional user for the commit</source> - <translation>Zadejte nepovinného uživatele pro zápis změn (commit)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> - <source>Select to merge with parent of the project directory</source> - <translation>Vybrat pro merge s rodičem složky projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> - <source>Merge with current parent</source> - <translation>Merge s aktuálním rodičem</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="76"/> - <source>Backed out changeset <{0}>.</source> - <translation>Zálohovat množinu změn <{0}>.</translation> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgBookmarkDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="45"/> + <source>Define Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="25"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="32"/> + <source>Enter the bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="45"/> + <source>Select a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="54"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="60"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Vybrat pro zadání revize číslem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="63"/> + <source>Number</source> + <translation type="unfinished">Číslo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="73"/> + <source>Enter a revision number</source> + <translation type="unfinished">Zadejte číslo revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> + <source>TIP</source> + <translation type="unfinished">TIP</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="42"/> + <source>Move Bookmark</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgBookmarkRenameDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="14"/> + <source>Rename Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="23"/> + <source>New Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="30"/> + <source>Enter the bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="37"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="50"/> + <source>Enter the bookmark name to be renamed</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgBookmarksInOutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="32"/> + <source><b>Bookmarks List</b> +<p>This shows a list of the bookmarks.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="49"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="54"/> + <source>Changeset</source> + <translation type="unfinished">Množina změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="68"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="90"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="112"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.ui" line="115"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="118"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="125"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.ui" line="132"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="135"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="138"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="48"/> + <source>Mercurial Incoming Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/> + <source>Mercurial Outgoing Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <source>no bookmarks found</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgBookmarksListDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="14"/> + <source>Mercurial Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="17"/> + <source><b>Mercurial Bookmarks</b> +<p>This dialog shows a list of the projects bookmarks.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="36"/> + <source><b>Bookmarks List</b> +<p>This shows a list of the projects bookmarks.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="53"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="58"/> + <source>Changeset</source> + <translation type="unfinished">Množina změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="63"/> + <source>Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="68"/> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="82"/> + <source>Errors</source> + <translation type="unfinished">Chyby</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="104"/> + <source>Input</source> + <translation type="unfinished">Vstup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="126"/> + <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/BookmarksExtension/HgBookmarksListDialog.ui" line="129"/> + <source>&Send</source> + <translation type="unfinished">Ode&slat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="132"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="139"/> + <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/BookmarksExtension/HgBookmarksListDialog.ui" line="146"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="149"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="152"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <source>Process Generation Error</source> + <translation type="unfinished">Chyba v procesu generování</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <source>no bookmarks defined</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -15628,29 +16209,44 @@ <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> <source>Select to not specify a specific revision</source> <translation>Vybrat pro specifikaci konkrétní revize</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> + <source>Select the compression type (empty for default)</source> + <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> + <source>Select to bundle all changesets</source> + <translation>Vybrat pro zabalení množin změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> + <source>Bundle all changesets</source> + <translation>Zabalit všechny množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> - <source>Select the compression type (empty for default)</source> - <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> - <source>Select to bundle all changesets</source> - <translation>Vybrat pro zabalení množin změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> - <source>Bundle all changesets</source> - <translation>Zabalit všechny množiny změn</translation> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -16011,12 +16607,12 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1060"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1057"/> <source>Author</source> <translation>Autor</translation> </message> @@ -16161,27 +16757,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454"/> - <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/HgLogBrowserDialog.py" line="457"/> - <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> + <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/HgLogBrowserDialog.py" line="460"/> + <source>Could not start the hg executable.</source> + <translation>Nelze spustit hg program.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -16235,6 +16831,11 @@ <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -16314,96 +16915,102 @@ <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> <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/HgLogDialog.py" line="198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <source>Bookmarks: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -16478,24 +17085,39 @@ <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> <source>Select to not specify a specific revision</source> <translation>Neurčovat konkrétní revizi</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> + <source>Select to force the merge operation</source> + <translation>Vybrat pro vynucení operace merge</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> + <source>Enforce merge</source> + <translation>Vynutit merge</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> - <source>Select to force the merge operation</source> - <translation>Vybrat pro vynucení operace merge</translation> + <source>Bookmark:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> - <source>Enforce merge</source> - <translation>Vynutit merge</translation> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -16732,1000 +17354,1005 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="52"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="75"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="52"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="75"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="78"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="58"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="81"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="66"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="89"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="70"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="96"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="103"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="107"/> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/> - <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> - <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> + <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> - <source>Export a project from the repository</source> - <translation>Export projekt z repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> - <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> - <source>&Add to repository...</source> - <translation>Přid&at do repozitáře...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> - <source>Add the local project to the repository</source> - <translation>Přidat lokální projekt do repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> - <source>Remove from repository (and disk)</source> - <translation>Odebrat z repozitáře (a z disku)</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> + <source>Export a project from the repository</source> + <translation>Export projekt z repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <source>Add to repository</source> + <translation>Přidat do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <source>&Add to repository...</source> + <translation>Přid&at do repozitáře...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> + <source>Add the local project to the repository</source> + <translation>Přidat lokální projekt do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> + <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> + <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/> + <source>Remove from repository (and disk)</source> + <translation>Odebrat z repozitáře (a z disku)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/> <source>&Remove from repository (and disk)</source> <translation>Odeb&rat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove the local project from the repository (and disk)</source> <translation>Odebrat lokální projekt z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Odebrat z repozitáře</b><p>Lokální projekt se odebere z repozitáře (a z disku).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="247"/> <source>Show limited log</source> <translation>Zobrazit limitovaný log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show a limited log of the local project</source> <translation>Zobrazit limitovaný log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> <translation><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> - <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> - <source>Show &difference</source> - <translation>Zobrazit o&dlišnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> - <source>Show the difference of the local project to the repository</source> - <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> - <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> - <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> + <source>Show difference</source> + <translation>Zobrazit odlišnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> + <source>Show &difference</source> + <translation>Zobrazit o&dlišnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> + <source>Show the difference of the local project to the repository</source> + <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> + <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> - <source>Show the status of the local project</source> - <translation>Zobrazit status lokálního projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> - <source>Show heads</source> - <translation>Zobrazit hlavy</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> - <source>Show the heads of the repository</source> - <translation>Zobrazit ukazatele hlav repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> - <source>Show parents</source> - <translation>Zobrazit předky</translation> + <source>Show the status of the local project</source> + <translation>Zobrazit status lokálního projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> - <source>Show the parents of the repository</source> - <translation>Zobrazit předky repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> + <source>Show heads</source> + <translation>Zobrazit hlavy</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> - <source>Show tip</source> - <translation>Zobrazit ukazatel tip</translation> + <source>Show the heads of the repository</source> + <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> - <source>Show the tip of the repository</source> - <translation>Zobrazí ukazatel tip repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <source>Show parents</source> + <translation>Zobrazit předky</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/> + <source>Show the parents of the repository</source> + <translation>Zobrazit předky repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="339"/> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> + <source>Show tip</source> + <translation>Zobrazit ukazatel tip</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/> + <source>Show the tip of the repository</source> + <translation>Zobrazí ukazatel tip repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source>Merge changes of a revision into the local project</source> - <translation>Sloučí změny revize do lokálního projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> - <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> - <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> - <source>Resolve conflicts</source> - <translation>Vyřešit konflikty</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> - <source>Resolve con&flicts</source> - <translation>Vyřešit kon&flikty</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> - <source>Resolve all conflicts of the local project</source> - <translation>Vyřešit všechny konflikty v lokálním projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><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="377"/> - <source>Tag in repository</source> - <translation>Vytvořit tag v repozitáři</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <source>Merge changes of a revision into the local project</source> + <translation>Sloučí změny revize do lokálního projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> + <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> + <source>Resolve conflicts</source> + <translation>Vyřešit konflikty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> + <source>Resolve con&flicts</source> + <translation>Vyřešit kon&flikty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <source>Resolve all conflicts of the local project</source> + <translation>Vyřešit všechny konflikty v lokálním projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> + <translation><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="400"/> + <source>Tag in repository</source> + <translation>Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> - <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="384"/> - <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="391"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> - <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="404"/> - <source>List branches</source> - <translation>Seznam větví</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> - <source>List branches...</source> - <translation>Seznam větví...</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="407"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> - <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="417"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> + <source>List tags...</source> + <translation>Seznam tagů...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <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="427"/> + <source>List branches</source> + <translation>Seznam větví</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <source>List branches...</source> + <translation>Seznam větví...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430"/> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <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="440"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <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="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <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="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> - <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="452"/> - <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="472"/> - <source>Switch</source> - <translation>Přepnout</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <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="475"/> + <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="495"/> + <source>Switch</source> + <translation>Přepnout</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476"/> - <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="479"/> - <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="486"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <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="499"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <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="502"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Spustit libovolný Mercurial příkaz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> - <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> + <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="509"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Command options</source> - <translation>Parametry příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Command &options...</source> - <translation>&Parametry příkazu...</translation> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> + <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="522"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Spustit libovolný Mercurial příkaz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Command options</source> + <translation>Parametry příkazu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Command &options...</source> + <translation>&Parametry příkazu...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>Show the Mercurial command options</source> <translation>Zobrazit parametry Mercurial příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><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="523"/> - <source>Configure</source> - <translation>Konfigurovat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> - <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="529"/> - <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> - <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> - <source>Edit repository config</source> - <translation>Editovat konfiguraci repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> - <source>Edit repository config...</source> - <translation>Editovat konfiguraci repozitáře...</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <source>Show an editor to edit the repository config file</source> - <translation>Zobrazit editor pro editaci konfiguračního souboru repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation><b>Zobrazit konfiguraci repozitáře</b><p>Zobrazí editor pro editaci konfiguračního souboru repozitáře.</p></translation> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><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="546"/> + <source>Configure</source> + <translation>Konfigurovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <source>Configure...</source> + <translation>Konfigurovat...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> - <source>Show combined config settings</source> - <translation>Zobrazit kombinovaná nastavení konfigurace</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> - <source>Show combined config settings...</source> - <translation>Zobrazit kombinovaná nastavení konfigurace...</translation> + <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="552"/> - <source>Show the combined config settings from all config files</source> - <translation>Zobrazit kombinovaná nastavení ze všech konfigurací</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation><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="562"/> - <source>Show paths</source> - <translation>Zobrazit cesty</translation> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> + <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <source>Edit repository config</source> + <translation>Editovat konfiguraci repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <source>Edit repository config...</source> + <translation>Editovat konfiguraci repozitáře...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Show paths...</source> - <translation>Zobrazit cesty...</translation> + <source>Show an editor to edit the repository config file</source> + <translation>Zobrazit editor pro editaci konfiguračního souboru repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> - <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="568"/> - <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="575"/> - <source>Verify repository</source> - <translation>Ověřit repozitář</translation> + <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> + <translation><b>Zobrazit konfiguraci repozitáře</b><p>Zobrazí editor pro editaci konfiguračního souboru repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <source>Show combined config settings</source> + <translation>Zobrazit kombinovaná nastavení konfigurace</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <source>Show combined config settings...</source> + <translation>Zobrazit kombinovaná nastavení konfigurace...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> + <source>Show the combined config settings from all config files</source> + <translation>Zobrazit kombinovaná nastavení ze všech konfigurací</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> - <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="581"/> - <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> + <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> + <translation><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="585"/> + <source>Show paths</source> + <translation>Zobrazit cesty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show paths...</source> + <translation>Zobrazit cesty...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> - <source>Recover</source> - <translation>Zotavit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> - <source>Recover...</source> - <translation>Zotavit...</translation> + <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="591"/> - <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="594"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> - <source>Repository Administration</source> - <translation>Administrace repozitáře</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Verify repository</source> + <translation>Ověřit repozitář</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <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="604"/> + <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="611"/> + <source>Recover</source> + <translation>Zotavit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Recover...</source> + <translation>Zotavit...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> - <source>Create .hgignore</source> - <translation>Vytvořit .hgignore</translation> + <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="617"/> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <source>Repository Administration</source> + <translation>Administrace repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> + <source>Create .hgignore</source> + <translation>Vytvořit .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <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="620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <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="650"/> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <source>Create changegroup...</source> + <translation>Vytvořit skupinu změn...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <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="692"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <source>Apply changegroups...</source> + <translation>Použít skupinu změn...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <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="843"/> + <source>Changegroup Management</source> + <translation>Správa skupin změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <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="698"/> + <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="482"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <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="488"/> + <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="706"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <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="712"/> + <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="719"/> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <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="725"/> + <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="732"/> + <source>Skip</source> + <translation>Přeskočit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <source>Skip the current changeset</source> + <translation>Přeskočit aktuální množinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation><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="745"/> + <source>Reset</source> + <translation>Reset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <source>Reset the bisect search data</source> + <translation>Reset vyhledávání bisect</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <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="849"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Mark as "good"...</source> + <translation>Označit jako "v pořádku"...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <source>Mark as "bad"...</source> + <translation>Označit jako "špatná"...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664"/> + <source>Preview changegroup</source> + <translation>Náhled skupiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664"/> + <source>Preview changegroup...</source> + <translation>Náhled skupiny změn...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <source>Identify</source> + <translation>Identifikovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <source>Identify...</source> + <translation>Identifikovat...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Create changegroup...</source> - <translation>Vytvořit skupinu změn...</translation> + <source>Identify the project directory</source> + <translation>Identifikovat adresář projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <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="669"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Apply changegroups...</source> - <translation>Použít skupinu změn...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> - <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="820"/> - <source>Changegroup Management</source> - <translation>Správa skupin změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <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="675"/> - <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="459"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <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="465"/> - <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="683"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> - <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="689"/> - <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="696"/> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <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="702"/> - <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="709"/> - <source>Skip</source> - <translation>Přeskočit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Skip the current changeset</source> - <translation>Přeskočit aktuální množinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><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="722"/> - <source>Reset</source> - <translation>Reset</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> - <source>Reset the bisect search data</source> - <translation>Reset vyhledávání bisect</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> - <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="826"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> - <source>Mark as "good"...</source> - <translation>Označit jako "v pořádku"...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Mark as "bad"...</source> - <translation>Označit jako "špatná"...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Preview changegroup</source> - <translation>Náhled skupiny změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Preview changegroup...</source> - <translation>Náhled skupiny změn...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> - <source>Identify</source> - <translation>Identifikovat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> - <source>Identify...</source> - <translation>Identifikovat...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> - <source>Identify the project directory</source> - <translation>Identifikovat adresář projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <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="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <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="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Identify changegroup</source> <translation>Identifikovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Identify changegroup...</source> <translation>Identifikovat skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><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="735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <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="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="183"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <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="815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <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="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <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="438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <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="748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <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="855"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -17800,24 +18427,39 @@ <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> <source>Select tip revision of repository</source> <translation>Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> + <source>TIP</source> + <translation>TIP</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="45"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <source>Select to not specify a specific revision</source> + <translation>Vybrat pro specifikaci konkrétní revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> - <source>TIP</source> - <translation>TIP</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="35"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="36"/> - <source>Select to not specify a specific revision</source> - <translation>Vybrat pro specifikaci konkrétní revize</translation> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -17833,90 +18475,105 @@ <translation>Revize &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Select to specify a revision by number</source> <translation>Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="188"/> - <source>Enter a revision number</source> - <translation>Zadejte číslo revize</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <source>Enter a revision number</source> + <translation>Zadejte číslo revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> <source>Enter a changeset id</source> <translation>Zadejte id množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> <source>Select to specify a revision by a tag</source> <translation>Vybrat pro specifikaci revize tagem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> <source>Select to specify a revision by a branch</source> <translation>Vybrat pro specifikaci revize přes větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> <source>Select tip revision of repository</source> <translation>Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> <source>Select revision before last commit</source> <translation>Vybrat revizi před posledním zapsáním změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> <source>Revision &2</source> <translation>Revize &2</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -42380,72 +43037,72 @@ <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do VCS repozitáře.</p></translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="159"/> + <location filename="VCS/ProjectHelper.py" line="163"/> <source>New Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="297"/> + <location filename="VCS/ProjectHelper.py" line="305"/> <source>Select version control system for the project</source> <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="316"/> + <location filename="VCS/ProjectHelper.py" line="324"/> <source>Would you like to edit the VCS command options?</source> <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="172"/> + <location filename="VCS/ProjectHelper.py" line="176"/> <source>Create project directory</source> <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="247"/> + <location filename="VCS/ProjectHelper.py" line="251"/> <source>New project from repository</source> <translation>Nový projekt z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="197"/> + <location filename="VCS/ProjectHelper.py" line="201"/> <source>Select a project file to open.</source> <translation>Výběr souboru s projektem pro otevření.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="239"/> + <location filename="VCS/ProjectHelper.py" line="243"/> <source>Shall the project file be added to the repository?</source> <translation>Může být soubor projektu přidán do repozitáře?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="247"/> + <location filename="VCS/ProjectHelper.py" line="251"/> <source>The project could not be retrieved from the repository.</source> <translation>Z repozitáře není možné získat soubor s projektem.</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="316"/> + <location filename="VCS/ProjectHelper.py" line="324"/> <source>Import Project</source> <translation>Importovat projekt</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="369"/> + <location filename="VCS/ProjectHelper.py" line="377"/> <source>Remove project from repository</source> <translation>Odebrat projekt z repozitáře</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="369"/> + <location filename="VCS/ProjectHelper.py" line="377"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Opravdu chcete odebrat tento projekt z repozitáře (a z disku)?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="345"/> + <location filename="VCS/ProjectHelper.py" line="353"/> <source>Update</source> <translation>Obnovit</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="345"/> + <location filename="VCS/ProjectHelper.py" line="353"/> <source>The project should be reread. Do this now?</source> <translation>Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="172"/> + <location filename="VCS/ProjectHelper.py" line="176"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> </message> @@ -42455,7 +43112,7 @@ <translation type="obsolete">Projekt vrácený z repozitáře neobsahuje eric projekt soubory (*.e4p *.e4pz *.e3p *.e3pz). Vytvořit je?</translation> </message> <message> - <location filename="VCS/ProjectHelper.py" line="212"/> + <location filename="VCS/ProjectHelper.py" line="216"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation type="unfinished"></translation> </message> @@ -45769,30 +46426,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> <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="1416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1548"/> <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="1420"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <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="1046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -45803,29 +46460,34 @@ <translation><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="1410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1542"/> <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="1412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> <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="1424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <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="1427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/> <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> </table></p></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> + <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>pep8</name>
--- a/i18n/eric5_de.ts Sun May 08 13:56:12 2011 +0200 +++ b/i18n/eric5_de.ts Sun May 08 15:19:58 2011 +0200 @@ -1379,6 +1379,69 @@ </message> </context> <context> + <name>Bookmarks</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="121"/> + <source>Mercurial Bookmark</source> + <translation>Mercurial Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/> + <source>Delete Bookmark</source> + <translation>Lesezeichen löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="139"/> + <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/BookmarksExtension/bookmarks.py" line="151"/> + <source>Delete Mercurial Bookmark</source> + <translation>Mercurial Lesezeichen löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="179"/> + <source>Rename Mercurial Bookmark</source> + <translation>Mercurial Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="212"/> + <source>Move Mercurial Bookmark</source> + <translation>Mercurial Lesezeichen verschieben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/> + <source>Pull Bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="289"/> + <source>Select the bookmark to be pulled:</source> + <translation>Wähle das herunterzuladende Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="301"/> + <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/BookmarksExtension/bookmarks.py" line="321"/> + <source>Push Bookmark</source> + <translation>Lesezeichen hochladen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/> + <source>Select the bookmark to be push:</source> + <translation>Wähle das hochzuladende Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="333"/> + <source>Pushing bookmark to a remote Mercurial repository</source> + <translation>Lade Lesezeichen zu einem entfernten Mercurial Repository hoch</translation> + </message> +</context> +<context> <name>BookmarksDialog</name> <message> <location filename="Helpviewer/Bookmarks/BookmarksDialog.ui" line="14"/> @@ -1600,6 +1663,174 @@ </message> </context> <context> + <name>BookmarksProjectHelper</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <source>List bookmarks</source> + <translation>Lesezeichen listen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <source>List bookmarks...</source> + <translation>Lesezeichen listen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="58"/> + <source>List bookmarks of the project</source> + <translation>Listet Lesezeichen des Projektes</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="61"/> + <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/BookmarksExtension/ProjectHelper.py" line="68"/> + <source>Define bookmark</source> + <translation>Lesezeichen hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> + <source>Define bookmark...</source> + <translation>Lesezeichen hinzufügen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="72"/> + <source>Define a bookmark for the project</source> + <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="75"/> + <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/BookmarksExtension/ProjectHelper.py" line="82"/> + <source>Delete bookmark</source> + <translation>Lesezeichen löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="86"/> + <source>Delete a bookmark of the project</source> + <translation>Löscht ein Lesezeichen aus dem Projekt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/> + <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/BookmarksExtension/ProjectHelper.py" line="96"/> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="100"/> + <source>Rename a bookmark of the project</source> + <translation>Benennt ein Lesezeichen des Projektes um</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="103"/> + <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/BookmarksExtension/ProjectHelper.py" line="110"/> + <source>Move bookmark</source> + <translation>Lesezeichen verschieben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> + <source>Move bookmark...</source> + <translation>Lesezeichen verschieben...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="114"/> + <source>Move a bookmark of the project</source> + <translation>Verschiebt ein Lesezeichen des Projektes</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="117"/> + <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/BookmarksExtension/ProjectHelper.py" line="124"/> + <source>Show incoming bookmarks</source> + <translation>Zeige eingehende Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="128"/> + <source>Show a list of incoming bookmarks</source> + <translation>Zeigt eine Liste eingehender Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="131"/> + <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/BookmarksExtension/ProjectHelper.py" line="139"/> + <source>Pull bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="143"/> + <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/BookmarksExtension/ProjectHelper.py" line="146"/> + <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/BookmarksExtension/ProjectHelper.py" line="154"/> + <source>Show outgoing bookmarks</source> + <translation>Zeige ausgehende Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="158"/> + <source>Show a list of outgoing bookmarks</source> + <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="161"/> + <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/BookmarksExtension/ProjectHelper.py" line="169"/> + <source>Push bookmark</source> + <translation>Lesezeichen hochladen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="173"/> + <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/BookmarksExtension/ProjectHelper.py" line="176"/> + <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/BookmarksExtension/ProjectHelper.py" line="191"/> + <source>Bookmarks</source> + <translation>Lesezeichen</translation> + </message> +</context> +<context> <name>BookmarksToolBar</name> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="39"/> @@ -3459,42 +3690,42 @@ <translation>&Filtere mit:</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="396"/> + <location filename="Project/CreateDialogCodeDialog.py" line="401"/> <source>Code Generation</source> <translation>Code Erzeugung</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="304"/> + <location filename="Project/CreateDialogCodeDialog.py" line="309"/> <source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Codevorlagedatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="337"/> + <location filename="Project/CreateDialogCodeDialog.py" line="342"/> <source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geöffnet werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="396"/> + <location filename="Project/CreateDialogCodeDialog.py" line="401"/> <source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source> <translation><p>Die Quelltextdatei "{0}" konnte nicht geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="262"/> + <location filename="Project/CreateDialogCodeDialog.py" line="267"/> <source>uic error</source> <translation>uic Fehler</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="262"/> + <location filename="Project/CreateDialogCodeDialog.py" line="267"/> <source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Es gab einen Fehler beim Laden des Formulars <b>{0}</b>.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="90"/> + <location filename="Project/CreateDialogCodeDialog.py" line="95"/> <source>Create Dialog Code</source> <translation>Formularcode Generator</translation> </message> <message> - <location filename="Project/CreateDialogCodeDialog.py" line="90"/> + <location filename="Project/CreateDialogCodeDialog.py" line="95"/> <source>The file <b>{0}</b> exists but does not contain any classes.</source> <translation>Die datei <b>{0}</b> existiert, enthält jedoch keine Klassen.</translation> </message> @@ -14828,247 +15059,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="197"/> <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="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="200"/> <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="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> <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="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <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="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="255"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="270"/> <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="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="311"/> <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="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/> <source>Commiting changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="455"/> <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="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/> <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="541"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="563"/> <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="599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="621"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="804"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="981"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1023"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1200"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1378"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/> <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="1354"/> - <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="1463"/> - <source>Resolving files/directories</source> - <translation>Löse Dateien/Verzeichnisse auf</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> - <source>Create Branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1485"/> + <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="1599"/> + <source>Resolving files/directories</source> + <translation>Löse Dateien/Verzeichnisse auf</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/> + <source>Create Branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1621"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/> <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="1567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1614"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="1519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1911"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1867"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2010"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> <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="1830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1973"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1889"/> <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="2014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2166"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -15234,64 +15465,417 @@ <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> <source>Select to not specify a specific revision</source> <translation>Auswählen, um keine spezifische Revision zu wählen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <source>Commit data</source> + <translation>Änderungsdaten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <source>Commit message:</source> + <translation>Änderungsbeschreibung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation>Gib die Änderungsbeschreibung ein oder lasse es leer, um den Standardtext zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <source>Commit Date:</source> + <translation>Datum für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <source>Enter optional date for the commit</source> + <translation>Gib das optionale Datum der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <source>Commit User:</source> + <translation>Nutzer für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <source>Enter optional user for the commit</source> + <translation>Gib den optionalen Nutzer der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> + <source>Select to merge with parent of the project directory</source> + <translation>Auswählen, um mit dem Vorgänger des Projektverzeichnisses zusammenzuführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> + <source>Merge with current parent</source> + <translation>Mit aktuellem Vorgänger zusammenführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="173"/> + <source>Backed out changeset <{0}>.</source> + <translation>Änderungssatz <{0}> umgekehrt.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> - <source>No revision selected</source> - <translation>Keine Revision ausgewählt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> - <source>Commit data</source> - <translation>Änderungsdaten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="171"/> - <source>Commit message:</source> - <translation>Änderungsbeschreibung:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Enter the commit message or leave empty to use the default one</source> - <translation>Gib die Änderungsbeschreibung ein oder lasse es leer, um den Standardtext zu verwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="190"/> - <source>Commit Date:</source> - <translation>Datum für Änderung:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> - <source>Enter optional date for the commit</source> - <translation>Gib das optionale Datum der Änderung ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="210"/> - <source>Commit User:</source> - <translation>Nutzer für Änderung:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="217"/> - <source>Enter optional user for the commit</source> - <translation>Gib den optionalen Nutzer der Änderung ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="229"/> - <source>Select to merge with parent of the project directory</source> - <translation>Auswählen, um mit dem Vorgänger des Projektverzeichnisses zusammenzuführen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="232"/> - <source>Merge with current parent</source> - <translation>Mit aktuellem Vorgänger zusammenführen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py" line="76"/> - <source>Backed out changeset <{0}>.</source> - <translation>Änderungssatz <{0}> umgekehrt.</translation> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> + </message> +</context> +<context> + <name>HgBookmarkDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="45"/> + <source>Define Bookmark</source> + <translation>Lesezeichen hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="25"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="32"/> + <source>Enter the bookmark name</source> + <translation>Gib den Lesezeichennamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="45"/> + <source>Select a bookmark</source> + <translation>Wähle ein Lesezeichen aus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="54"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="60"/> + <source>Select to specify a revision by number</source> + <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="63"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="73"/> + <source>Enter a revision number</source> + <translation>Gib eine Revisionsnummer ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <source>Select to specify a revision by changeset id</source> + <translation>Auswählen, um eine Revision mit ihrer Änderungssatz ID anzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Select tip revision of repository</source> + <translation>Wähle neueste Revision des Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> + <source>TIP</source> + <translation>TIP</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="42"/> + <source>Move Bookmark</source> + <translation>Lesezeichen verschieben</translation> + </message> +</context> +<context> + <name>HgBookmarkRenameDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="14"/> + <source>Rename Bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="23"/> + <source>New Name:</source> + <translation>Neuer Name:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="30"/> + <source>Enter the bookmark name</source> + <translation>Gib den Lesezeichennamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="37"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.ui" line="50"/> + <source>Enter the bookmark name to be renamed</source> + <translation>Gib den Lesezeichennamen, der umbenannt werden soll, ein</translation> + </message> +</context> +<context> + <name>HgBookmarksInOutDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="32"/> + <source><b>Bookmarks List</b> +<p>This shows a list of the bookmarks.</p></source> + <translation><b>Lesezeichenliste</b> +<p>Dies zeigt eine Liste aller Lesezeichen an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="49"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="54"/> + <source>Changeset</source> + <translation>Änderungssatz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="68"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="90"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="112"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.ui" line="115"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="118"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="125"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.ui" line="132"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Passwort Modus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="135"/> + <source>&Password Mode</source> + <translation>&Passwort Modus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.ui" line="138"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="48"/> + <source>Mercurial Incoming Bookmarks</source> + <translation>Eingehende Mercurial Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/> + <source>Mercurial Outgoing Bookmarks</source> + <translation>Ausgehende Mercurial Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <source>no bookmarks found</source> + <translation>keine Lesezeichen vorhanden</translation> + </message> +</context> +<context> + <name>HgBookmarksListDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="14"/> + <source>Mercurial Bookmarks</source> + <translation>Mercurial Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="17"/> + <source><b>Mercurial Bookmarks</b> +<p>This dialog shows a list of the projects bookmarks.</p></source> + <translation><b>Mercurial Lesezeichen</b> +<p>Dieser Dialog zeigt eine Liste aller Lesezeichen des Projektes an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="36"/> + <source><b>Bookmarks List</b> +<p>This shows a list of the projects bookmarks.</p></source> + <translation><b>Lesezeichenliste</b> +<p>Dies zeigt eine Liste aller Lesezeichen des Projektes an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="53"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="58"/> + <source>Changeset</source> + <translation>Änderungssatz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="63"/> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="68"/> + <source>Name</source> + <translation>Name</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="82"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="104"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="126"/> + <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/BookmarksExtension/HgBookmarksListDialog.ui" line="129"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="132"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="139"/> + <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/BookmarksExtension/HgBookmarksListDialog.ui" line="146"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Passwort Modus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="149"/> + <source>&Password Mode</source> + <translation>&Passwort Modus</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.ui" line="152"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <source>Process Generation Error</source> + <translation>Fehler beim Prozessstart</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <source>no bookmarks defined</source> + <translation>keine Lesezeichen vorhanden</translation> </message> </context> <context> @@ -15367,29 +15951,44 @@ <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> <source>Select to not specify a specific revision</source> <translation>Auswählen, um keine spezifische Revision zu wählen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> + <source>Select the compression type (empty for default)</source> + <translation>Wähle den Kompressionstype (leer für Standard)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> + <source>Select to bundle all changesets</source> + <translation>Auswählen, um alle Änderungssätze zu packen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> + <source>Bundle all changesets</source> + <translation>Packe alle Änderungssätze</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> - <source>No revision selected</source> - <translation>Keine Revision ausgewählt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> - <source>Select the compression type (empty for default)</source> - <translation>Wähle den Kompressionstype (leer für Standard)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> - <source>Select to bundle all changesets</source> - <translation>Auswählen, um alle Änderungssätze zu packen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> - <source>Bundle all changesets</source> - <translation>Packe alle Änderungssätze</translation> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> </message> </context> <context> @@ -15751,12 +16350,12 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1060"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1057"/> <source>Author</source> <translation>Autor</translation> </message> @@ -15891,27 +16490,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="629"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="454"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="457"/> - <source>Could not start the hg executable.</source> - <translation>Das hg Programm konnte nicht gestartet werden.</translation> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="460"/> + <source>Could not start the hg executable.</source> + <translation>Das hg Programm konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -15975,6 +16574,11 @@ <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Ausgang)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/> + <source>Bookmarks</source> + <translation>Lesezeichen</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -16054,102 +16658,109 @@ <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPl