Sat, 28 Jan 2017 19:21:31 +0100
Removed the VCS log dialogs in favour of the log browser dialogs.
--- a/APIs/Python3/eric6.api Sat Jan 28 18:04:14 2017 +0100 +++ b/APIs/Python3/eric6.api Sat Jan 28 19:21:31 2017 +0100 @@ -4905,13 +4905,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0, revisions=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -4922,17 +4915,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.getRevisions?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_limitGroup_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsProjectDirPicker_textChanged?4(txt) @@ -5405,7 +5387,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) @@ -5513,9 +5494,6 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog.getData?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.getParameters?4() @@ -5633,7 +5611,6 @@ eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -5749,13 +5726,6 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) @@ -5879,7 +5849,6 @@ eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -9332,7 +9301,6 @@ eric6.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInitConfig?4(project) -eric6.VCS.VersionControl.VersionControl.vcsLog?4(name) eric6.VCS.VersionControl.VersionControl.vcsLogBrowser?4(name, isFile=False) eric6.VCS.VersionControl.VersionControl.vcsMerge?4(name) eric6.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False)
--- a/APIs/Python3/eric6.bas Sat Jan 28 18:04:14 2017 +0100 +++ b/APIs/Python3/eric6.bas Sat Jan 28 19:21:31 2017 +0100 @@ -370,9 +370,7 @@ HgHisteditPlanEditor QDialog Ui_HgHisteditPlanEditor HgImportDialog QDialog Ui_HgImportDialog HgLogBrowserDialog QWidget Ui_HgLogBrowserDialog -HgLogDialog QWidget Ui_HgLogDialog HgMergeDialog QDialog Ui_HgMergeDialog -HgMultiRevisionSelectionDialog QDialog Ui_HgMultiRevisionSelectionDialog HgNewProjectOptionsDialog QDialog Ui_HgNewProjectOptionsDialog HgOptionsDialog QDialog Ui_HgOptionsDialog HgPhaseDialog QDialog Ui_HgPhaseDialog @@ -744,7 +742,6 @@ SvnDiffHighlighter E5GenericDiffHighlighter SvnInfoDialog QDialog SvnDialogMixin Ui_VcsRepositoryInfoDialog SvnLogBrowserDialog QWidget Ui_SvnLogBrowserDialog -SvnLogDialog QWidget Ui_SvnLogDialog SvnLoginDialog QDialog Ui_SvnLoginDialog SvnMergeDialog QDialog Ui_SvnMergeDialog SvnNewProjectOptionsDialog QDialog Ui_SvnNewProjectOptionsDialog
--- a/Documentation/Help/source.qhp Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Help/source.qhp Sat Jan 28 19:21:31 2017 +0100 @@ -606,9 +606,7 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> @@ -648,7 +646,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html" /> @@ -684,7 +681,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html" /> @@ -7159,7 +7155,6 @@ <keyword name="Hg.vcsImport" id="Hg.vcsImport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsImport" /> <keyword name="Hg.vcsInit" id="Hg.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInit" /> <keyword name="Hg.vcsInitConfig" id="Hg.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInitConfig" /> - <keyword name="Hg.vcsLog" id="Hg.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLog" /> <keyword name="Hg.vcsLogBrowser" id="Hg.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLogBrowser" /> <keyword name="Hg.vcsMerge" id="Hg.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMerge" /> <keyword name="Hg.vcsMove" id="Hg.vcsMove" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMove" /> @@ -7629,23 +7624,6 @@ <keyword name="HgLogBrowserDialog.on_upButton_clicked" id="HgLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_upButton_clicked" /> <keyword name="HgLogBrowserDialog.show" id="HgLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.show" /> <keyword name="HgLogBrowserDialog.start" id="HgLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.start" /> - <keyword name="HgLogDialog" id="HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog" /> - <keyword name="HgLogDialog (Constructor)" id="HgLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__init__" /> - <keyword name="HgLogDialog (Module)" id="HgLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> - <keyword name="HgLogDialog.__finish" id="HgLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__finish" /> - <keyword name="HgLogDialog.__getParents" id="HgLogDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__getParents" /> - <keyword name="HgLogDialog.__procFinished" id="HgLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__procFinished" /> - <keyword name="HgLogDialog.__processOutputLine" id="HgLogDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__processOutputLine" /> - <keyword name="HgLogDialog.__readStderr" id="HgLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStderr" /> - <keyword name="HgLogDialog.__readStdout" id="HgLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStdout" /> - <keyword name="HgLogDialog.__showError" id="HgLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__showError" /> - <keyword name="HgLogDialog.__sourceChanged" id="HgLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__sourceChanged" /> - <keyword name="HgLogDialog.closeEvent" id="HgLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.closeEvent" /> - <keyword name="HgLogDialog.keyPressEvent" id="HgLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.keyPressEvent" /> - <keyword name="HgLogDialog.on_input_returnPressed" id="HgLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_input_returnPressed" /> - <keyword name="HgLogDialog.on_passwordCheckBox_toggled" id="HgLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgLogDialog.on_sendButton_clicked" id="HgLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_sendButton_clicked" /> - <keyword name="HgLogDialog.start" id="HgLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.start" /> <keyword name="HgMergeDialog" id="HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog" /> <keyword name="HgMergeDialog (Constructor)" id="HgMergeDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.__init__" /> <keyword name="HgMergeDialog (Module)" id="HgMergeDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> @@ -7659,20 +7637,6 @@ <keyword name="HgMergeDialog.on_idEdit_textChanged" id="HgMergeDialog.on_idEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idEdit_textChanged" /> <keyword name="HgMergeDialog.on_tagButton_toggled" id="HgMergeDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagButton_toggled" /> <keyword name="HgMergeDialog.on_tagCombo_editTextChanged" id="HgMergeDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog" id="HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog" /> - <keyword name="HgMultiRevisionSelectionDialog (Constructor)" id="HgMultiRevisionSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__init__" /> - <keyword name="HgMultiRevisionSelectionDialog (Module)" id="HgMultiRevisionSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> - <keyword name="HgMultiRevisionSelectionDialog.__updateOK" id="HgMultiRevisionSelectionDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__updateOK" /> - <keyword name="HgMultiRevisionSelectionDialog.getRevisions" id="HgMultiRevisionSelectionDialog.getRevisions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.getRevisions" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" id="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchButton_toggled" id="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" id="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" id="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" id="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_limitGroup_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagButton_toggled" id="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" /> <keyword name="HgNewProjectOptionsDialog" id="HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog" /> <keyword name="HgNewProjectOptionsDialog (Constructor)" id="HgNewProjectOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.__init__" /> <keyword name="HgNewProjectOptionsDialog (Module)" id="HgNewProjectOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> @@ -13030,8 +12994,6 @@ <keyword name="Subversion.vcsInit" id="Subversion.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInit" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsInitConfig" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInitConfig" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLog" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMerge" /> @@ -13338,27 +13300,6 @@ <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> - <keyword name="SvnLogDialog.__finish" id="SvnLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__finish" /> - <keyword name="SvnLogDialog.__procFinished" id="SvnLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__procFinished" /> - <keyword name="SvnLogDialog.__readStderr" id="SvnLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStderr" /> - <keyword name="SvnLogDialog.__readStdout" id="SvnLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStdout" /> - <keyword name="SvnLogDialog.__showError" id="SvnLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__showError" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.closeEvent" id="SvnLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.closeEvent" /> - <keyword name="SvnLogDialog.keyPressEvent" id="SvnLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.keyPressEvent" /> - <keyword name="SvnLogDialog.on_buttonBox_clicked" id="SvnLogDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.on_buttonBox_clicked" /> - <keyword name="SvnLogDialog.on_input_returnPressed" id="SvnLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_input_returnPressed" /> - <keyword name="SvnLogDialog.on_passwordCheckBox_toggled" id="SvnLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="SvnLogDialog.on_sendButton_clicked" id="SvnLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_sendButton_clicked" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.start" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.start" /> <keyword name="SvnLoginDialog" id="SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog" /> <keyword name="SvnLoginDialog (Constructor)" id="SvnLoginDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog.__init__" /> <keyword name="SvnLoginDialog (Module)" id="SvnLoginDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> @@ -15164,7 +15105,6 @@ <keyword name="VersionControl.vcsImport" id="VersionControl.vcsImport" ref="eric6.VCS.VersionControl.html#VersionControl.vcsImport" /> <keyword name="VersionControl.vcsInit" id="VersionControl.vcsInit" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInit" /> <keyword name="VersionControl.vcsInitConfig" id="VersionControl.vcsInitConfig" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInitConfig" /> - <keyword name="VersionControl.vcsLog" id="VersionControl.vcsLog" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLog" /> <keyword name="VersionControl.vcsLogBrowser" id="VersionControl.vcsLogBrowser" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLogBrowser" /> <keyword name="VersionControl.vcsMerge" id="VersionControl.vcsMerge" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMerge" /> <keyword name="VersionControl.vcsMove" id="VersionControl.vcsMove" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMove" /> @@ -17507,9 +17447,7 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html</file> @@ -17585,7 +17523,6 @@ <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html</file> @@ -17617,7 +17554,6 @@ <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html</file>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,275 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</h1> -<p> -Module implementing a dialog to show the output of the hg log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgLogDialog">HgLogDialog</a></td> -<td>Class implementing a dialog to show the output of the hg log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgLogDialog" ID="HgLogDialog"></a> -<h2>HgLogDialog</h2> -<p> - Class implementing a dialog to show the output of the hg log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. -</p> -<h3>Derived from</h3> -QWidget, Ui_HgLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgLogDialog.__init__">HgLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgLogDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr><tr> -<td><a href="#HgLogDialog.__getParents">__getParents</a></td> -<td>Private method to get the parents of the currently viewed file/directory.</td> -</tr><tr> -<td><a href="#HgLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__processOutputLine">__processOutputLine</a></td> -<td>Private method to process the lines of output.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr><tr> -<td><a href="#HgLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#HgLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#HgLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#HgLogDialog.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="#HgLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the hg process.</td> -</tr><tr> -<td><a href="#HgLogDialog.start">start</a></td> -<td>Public slot to start the hg log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgLogDialog.__init__" ID="HgLogDialog.__init__"></a> -<h4>HgLogDialog (Constructor)</h4> -<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, isFile=False, 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 (string; one of log, incoming, outgoing) -</dd><dt><i>bundle</i></dt> -<dd> -name of a bundle file (string) -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgLogDialog.__finish" ID="HgLogDialog.__finish"></a> -<h4>HgLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p><a NAME="HgLogDialog.__getParents" ID="HgLogDialog.__getParents"></a> -<h4>HgLogDialog.__getParents</h4> -<b>__getParents</b>(<i>rev</i>) -<p> - Private method to get the parents of the currently viewed - file/directory. -</p><dl> -<dt><i>rev</i></dt> -<dd> -revision number to get parents for (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of parent revisions (list of strings) -</dd> -</dl><a NAME="HgLogDialog.__procFinished" ID="HgLogDialog.__procFinished"></a> -<h4>HgLogDialog.__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="HgLogDialog.__processOutputLine" ID="HgLogDialog.__processOutputLine"></a> -<h4>HgLogDialog.__processOutputLine</h4> -<b>__processOutputLine</b>(<i>line</i>) -<p> - Private method to process the lines of output. -</p><dl> -<dt><i>line</i></dt> -<dd> -output line to be processed (string) -</dd> -</dl><a NAME="HgLogDialog.__readStderr" ID="HgLogDialog.__readStderr"></a> -<h4>HgLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="HgLogDialog.__readStdout" ID="HgLogDialog.__readStdout"></a> -<h4>HgLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="HgLogDialog.__showError" ID="HgLogDialog.__showError"></a> -<h4>HgLogDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p><dl> -<dt><i>out</i></dt> -<dd> -error to be shown (string) -</dd> -</dl><a NAME="HgLogDialog.__sourceChanged" ID="HgLogDialog.__sourceChanged"></a> -<h4>HgLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="HgLogDialog.closeEvent" ID="HgLogDialog.closeEvent"></a> -<h4>HgLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="HgLogDialog.keyPressEvent" ID="HgLogDialog.keyPressEvent"></a> -<h4>HgLogDialog.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="HgLogDialog.on_input_returnPressed" ID="HgLogDialog.on_input_returnPressed"></a> -<h4>HgLogDialog.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="HgLogDialog.on_passwordCheckBox_toggled" ID="HgLogDialog.on_passwordCheckBox_toggled"></a> -<h4>HgLogDialog.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="HgLogDialog.on_sendButton_clicked" ID="HgLogDialog.on_sendButton_clicked"></a> -<h4>HgLogDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the hg process. -</p><a NAME="HgLogDialog.start" ID="HgLogDialog.start"></a> -<h4>HgLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0, revisions=None</i>) -<p> - Public slot to start the hg log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd><dt><i>revisions</i></dt> -<dd> -revisions to show log for (list of strings) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</h1> -<p> -Module implementing a dialog to select revisions. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgMultiRevisionSelectionDialog">HgMultiRevisionSelectionDialog</a></td> -<td>Class implementing a dialog to select revisions.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgMultiRevisionSelectionDialog" ID="HgMultiRevisionSelectionDialog"></a> -<h2>HgMultiRevisionSelectionDialog</h2> -<p> - Class implementing a dialog to select revisions. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgMultiRevisionSelectionDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgMultiRevisionSelectionDialog.__init__">HgMultiRevisionSelectionDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.__updateOK">__updateOK</a></td> -<td>Private slot to update the OK button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.getRevisions">getRevisions</a></td> -<td>Public method to retrieve the selected revisions.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.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="#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Bookmark combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.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="#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Branch combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled">on_changesetsButton_toggled</a></td> -<td>Private slot to handle changes of the Changesets select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged">on_changesetsEdit_textChanged</a></td> -<td>Private slot to handle changes of the Changesets edit.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_limitGroup_toggled">on_limitGroup_toggled</a></td> -<td>Private slot to handle changes of the Limit Results group status.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.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="#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Tag combo.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgMultiRevisionSelectionDialog.__init__" ID="HgMultiRevisionSelectionDialog.__init__"></a> -<h4>HgMultiRevisionSelectionDialog (Constructor)</h4> -<b>HgMultiRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None</i>) -<p> - Constructor -</p><dl> -<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>emptyRevsOk</i></dt> -<dd> -flag indicating that it is ok to not enter - revisions (boolean) -</dd><dt><i>showLimit</i></dt> -<dd> -flag indicating to show the limit entry (boolean) -</dd><dt><i>limitDefault</i></dt> -<dd> -default value for the limit (integer) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.__updateOK" ID="HgMultiRevisionSelectionDialog.__updateOK"></a> -<h4>HgMultiRevisionSelectionDialog.__updateOK</h4> -<b>__updateOK</b>(<i></i>) -<p> - Private slot to update the OK button. -</p><a NAME="HgMultiRevisionSelectionDialog.getRevisions" ID="HgMultiRevisionSelectionDialog.getRevisions"></a> -<h4>HgMultiRevisionSelectionDialog.getRevisions</h4> -<b>getRevisions</b>(<i></i>) -<p> - Public method to retrieve the selected revisions. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple of selected revisions (list of strings) and number - of entries to be shown (integer) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.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="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.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="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ID="HgMultiRevisionSelectionDialog.on_branchButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.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="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.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="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ID="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsButton_toggled</h4> -<b>on_changesetsButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Changesets select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ID="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged</h4> -<b>on_changesetsEdit_textChanged</b>(<i></i>) -<p> - Private slot to handle changes of the Changesets edit. -</p><a NAME="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ID="HgMultiRevisionSelectionDialog.on_limitGroup_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_limitGroup_toggled</h4> -<b>on_limitGroup_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Limit Results group status. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the group (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ID="HgMultiRevisionSelectionDialog.on_tagButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.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="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.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
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Jan 28 19:21:31 2017 +0100 @@ -359,9 +359,6 @@ <td><a href="#Hg.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Hg.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Mercurial repository.</td> -</tr><tr> <td><a href="#Hg.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> </tr><tr> @@ -1723,17 +1720,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Hg.vcsLog" ID="Hg.vcsLog"></a> -<h4>Hg.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Mercurial repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Hg.vcsLogBrowser" ID="Hg.vcsLogBrowser"></a> <h4>Hg.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, SvnDialogMixin, Ui_SvnLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__finish">__finish</a></td> -<td>Private slot called when the user pressed the button.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__showError">__showError</a></td> -<td>Private slot to show an error message.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.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="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the svn log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__finish" ID="SvnLogDialog.__finish"></a> -<h4>SvnLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the user pressed the button. -</p><a NAME="SvnLogDialog.__showError" ID="SvnLogDialog.__showError"></a> -<h4>SvnLogDialog.__showError</h4> -<b>__showError</b>(<i>msg</i>) -<p> - Private slot to show an error message. -</p><dl> -<dt><i>msg</i></dt> -<dd> -error message to show (string) -</dd> -</dl><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.on_buttonBox_clicked" ID="SvnLogDialog.on_buttonBox_clicked"></a> -<h4>SvnLogDialog.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="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the svn log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Sat Jan 28 19:21:31 2017 +0100 @@ -219,9 +219,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1075,17 +1072,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</title> -<meta charset="UTF-8"> -<style> -body { - background: #EDECE6; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #85774A; } -h2 { color: white; background: #85774A; } -h3 { color: white; background: #9D936E; } -h4 { color: white; background: #9D936E; } - -a { color: #BA6D36; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, Ui_SvnLogDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#SvnLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#SvnLogDialog.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="#SvnLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#SvnLogDialog.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="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the cvs log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__procFinished" ID="SvnLogDialog.__procFinished"></a> -<h4>SvnLogDialog.__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="SvnLogDialog.__readStderr" ID="SvnLogDialog.__readStderr"></a> -<h4>SvnLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="SvnLogDialog.__readStdout" ID="SvnLogDialog.__readStdout"></a> -<h4>SvnLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.closeEvent" ID="SvnLogDialog.closeEvent"></a> -<h4>SvnLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="SvnLogDialog.keyPressEvent" ID="SvnLogDialog.keyPressEvent"></a> -<h4>SvnLogDialog.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="SvnLogDialog.on_input_returnPressed" ID="SvnLogDialog.on_input_returnPressed"></a> -<h4>SvnLogDialog.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="SvnLogDialog.on_passwordCheckBox_toggled" ID="SvnLogDialog.on_passwordCheckBox_toggled"></a> -<h4>SvnLogDialog.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="SvnLogDialog.on_sendButton_clicked" ID="SvnLogDialog.on_sendButton_clicked"></a> -<h4>SvnLogDialog.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="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the cvs log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Sat Jan 28 19:21:31 2017 +0100 @@ -210,9 +210,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1026,17 +1023,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.VCS.VersionControl.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/eric6.VCS.VersionControl.html Sat Jan 28 19:21:31 2017 +0100 @@ -184,9 +184,6 @@ <td><a href="#VersionControl.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#VersionControl.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory in the vcs.</td> -</tr><tr> <td><a href="#VersionControl.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to view the log of a file/directory in the vcs with a log browser dialog.</td> </tr><tr> @@ -853,22 +850,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="VersionControl.vcsLog" ID="VersionControl.vcsLog"></a> -<h4>VersionControl.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory in the vcs. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log for (string) -</dd> -</dl><dl> -<dt>Raises <b>RuntimeError</b>:</dt> -<dd> -to indicate that this method must be - implemented by a subclass -</dd> </dl><a NAME="VersionControl.vcsLogBrowser" ID="VersionControl.vcsLogBrowser"></a> <h4>VersionControl.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sat Jan 28 19:21:31 2017 +0100 @@ -149,15 +149,9 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html">HgLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html">HgLogDialog</a></td> -<td>Module implementing a dialog to show the output of the hg log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html">HgMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html">HgMultiRevisionSelectionDialog</a></td> -<td>Module implementing a dialog to select revisions.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html">HgNewProjectOptionsDialog</a></td> <td>Module implementing the Mercurial Options Dialog for a new project from the repository.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Sat Jan 28 19:21:31 2017 +0100 @@ -83,9 +83,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html">SvnLoginDialog</a></td> <td>Module implementing the login dialog for pysvn.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Sat Jan 28 18:04:14 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Sat Jan 28 19:21:31 2017 +0100 @@ -74,9 +74,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html">SvnMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr>
--- a/Plugins/PluginVcsMercurial.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/PluginVcsMercurial.py Sat Jan 28 19:21:31 2017 +0100 @@ -160,7 +160,6 @@ self.__mercurialDefaults = { "StopLogOnCopy": True, # used in log browser - "UseLogBrowser": True, "LogLimit": 20, "CommitMessages": 20, "Commits": [], @@ -248,9 +247,8 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", - "PreferUnbundle", "CreateBackup", "InternalMerge", - "ConsiderHidden"]: + if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle", + "CreateBackup", "InternalMerge", "ConsiderHidden"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "CommitAuthorsLimit",
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Jan 28 19:21:31 2017 +0100 @@ -57,9 +57,6 @@ self.__plugin.getPreferences("CommitMessages")) self.commitAuthorsSpinBox.setValue( self.__plugin.getPreferences("CommitAuthorsLimit")) - # incoming/outgoing - self.logBrowserCheckBox.setChecked( - self.__plugin.getPreferences("UseLogBrowser")) # pull self.pullUpdateCheckBox.setChecked( self.__plugin.getPreferences("PullUpdate")) @@ -96,9 +93,6 @@ "CommitMessages", self.commitSpinBox.value()) self.__plugin.setPreferences( "CommitAuthorsLimit", self.commitAuthorsSpinBox.value()) - # incoming/outgoing - self.__plugin.setPreferences( - "UseLogBrowser", self.logBrowserCheckBox.isChecked()) # pull self.__plugin.setPreferences( "PullUpdate", self.pullUpdateCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Sat Jan 28 19:21:31 2017 +0100 @@ -231,25 +231,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Incoming / Outgoing</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QCheckBox" name="logBrowserCheckBox"> - <property name="toolTip"> - <string>Select to show the incoming and outgoing log in a log browser dialog</string> - </property> - <property name="text"> - <string>Use Log Browser for incoming / outgoing log</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="groupBox_4"> <property name="title"> <string>Pull</string> @@ -380,7 +361,6 @@ <tabstop>logWidthSpinBox</tabstop> <tabstop>commitSpinBox</tabstop> <tabstop>commitAuthorsSpinBox</tabstop> - <tabstop>logBrowserCheckBox</tabstop> <tabstop>pullUpdateCheckBox</tabstop> <tabstop>preferUnbundleCheckBox</tabstop> <tabstop>internalMergeCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,551 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2010 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the hg log command process. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray, \ - qVersion -from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit - -from E5Gui.E5Application import e5App -from E5Gui import E5MessageBox - -from .Ui_HgLogDialog import Ui_HgLogDialog - -import Utilities - - -class HgLogDialog(QWidget, Ui_HgLogDialog): - """ - Class implementing a dialog to show the output of the hg log command - process. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. - """ - def __init__(self, vcs, mode="log", bundle=None, isFile=False, - parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param mode mode of the dialog (string; one of log, incoming, outgoing) - @param bundle name of a bundle file (string) - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(HgLogDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - if mode in ("log", "incoming", "outgoing"): - self.mode = mode - else: - self.mode = "log" - self.bundle = bundle - self.__hgClient = self.vcs.getClient() - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.revisions = [] # stack of remembered revisions - self.revString = self.tr('Revision') - self.projectMode = False - - self.logEntries = [] # list of log entries - self.lastLogEntry = {} - self.fileCopies = {} - self.endInitialText = False - self.initialText = [] - - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, fn, noEntries=0, revisions=None): - """ - Public slot to start the hg log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - @param revisions revisions to show log for (list of strings) - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.intercept = False - self.filename = fn - self.dname, self.fname = self.vcs.splitPath(fn) - - # find the root of the repo - self.repodir = self.dname - while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): - self.repodir = os.path.dirname(self.repodir) - if os.path.splitdrive(self.repodir)[1] == os.sep: - return - - self.projectMode = (self.fname == "." and self.dname == self.repodir) - - self.activateWindow() - self.raise_() - - preargs = [] - args = self.vcs.initCommand(self.mode) - if noEntries and self.mode == "log": - args.append('--limit') - args.append(str(noEntries)) - if self.mode in ("incoming", "outgoing"): - args.append("--newest-first") - if self.vcs.hasSubrepositories(): - args.append("--subrepos") - if self.mode == "log": - args.append('--copies') - args.append('--template') - args.append(os.path.join(os.path.dirname(__file__), - "templates", - "logDialogBookmarkPhase.tmpl")) - if self.mode == "incoming": - if self.bundle: - args.append(self.bundle) - elif not self.vcs.hasSubrepositories(): - project = e5App().getObject("Project") - self.vcs.bundleFile = os.path.join( - project.getProjectManagementDir(), "hg-bundle.hg") - if os.path.exists(self.vcs.bundleFile): - os.remove(self.vcs.bundleFile) - preargs = args[:] - preargs.append("--quiet") - preargs.append('--bundle') - preargs.append(self.vcs.bundleFile) - args.append(self.vcs.bundleFile) - if revisions: - for rev in revisions: - args.append("--rev") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - if preargs: - out, err = self.__hgClient.runcommand(preargs) - else: - err = "" - if err: - self.__showError(err) - elif self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out and self.isVisible(): - for line in out.splitlines(True): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - - self.process.setWorkingDirectory(self.repodir) - - if preargs: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - process.waitForFinished(30000) - - if self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.__finish() - - def __getParents(self, rev): - """ - Private method to get the parents of the currently viewed - file/directory. - - @param rev revision number to get parents for (string) - @return list of parent revisions (list of strings) - """ - errMsg = "" - parents = [] - - if int(rev) > 0: - args = self.vcs.initCommand("parents") - if self.mode == "incoming": - if self.bundle: - args.append("--repository") - args.append(self.bundle) - elif self.vcs.bundleFile and \ - os.path.exists(self.vcs.bundleFile): - args.append("--repository") - args.append(self.vcs.bundleFile) - args.append("--template") - args.append("{rev}:{node|short}\n") - args.append("-r") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") - - if errMsg: - E5MessageBox.critical( - self, - self.tr("Mercurial Error"), - errMsg) - - if output: - parents = [p for p in output.strip().splitlines()] - - return parents - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.contents.clear() - - if not self.logEntries: - self.errors.append(self.tr("No log available for '{0}'") - .format(self.filename)) - self.errorGroup.show() - return - - html = "" - - if self.initialText: - for line in self.initialText: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - html += '{0}<br/>\n'.format(80 * "=") - - for entry in self.logEntries: - fileCopies = {} - if entry["file_copies"]: - for fentry in entry["file_copies"].split(", "): - newName, oldName = fentry[:-1].split(" (") - fileCopies[newName] = oldName - - rev, hexRev = entry["change"].split(":") - dstr = '<p><b>{0} {1}</b>'.format(self.revString, entry["change"]) - if entry["parents"]: - parents = entry["parents"].split() - else: - parents = self.__getParents(rev) - for parent in parents: - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = parent.split(":")[0] + '_' + rev - url.setQuery(query) - else: - query = QByteArray() - query.append(parent.split(":")[0]).append('_').append(rev) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(parent), - ) - dstr += '<br />\n' - html += dstr - - if "phase" in entry: - html += self.tr("Phase: {0}<br />\n")\ - .format(entry["phase"]) - - html += self.tr("Branch: {0}<br />\n")\ - .format(entry["branches"]) - - html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) - - if "bookmarks" in entry: - html += self.tr("Bookmarks: {0}<br />\n")\ - .format(entry["bookmarks"]) - - html += self.tr("Parents: {0}<br />\n")\ - .format(entry["parents"]) - - html += self.tr('<i>Author: {0}</i><br />\n')\ - .format(Utilities.html_encode(entry["user"])) - - date, time = entry["date"].split()[:2] - html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ - .format(date, time) - - for line in entry["description"]: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - - if entry["file_adds"]: - html += '<br />\n' - for f in entry["file_adds"].strip().split(", "): - if f in fileCopies: - html += self.tr( - 'Added {0} (copied from {1})<br />\n')\ - .format(Utilities.html_encode(f), - Utilities.html_encode(fileCopies[f])) - else: - html += self.tr('Added {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["files_mods"]: - html += '<br />\n' - for f in entry["files_mods"].strip().split(", "): - html += self.tr('Modified {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["file_dels"]: - html += '<br />\n' - for f in entry["file_dels"].strip().split(", "): - html += self.tr('Deleted {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - html += '</p>{0}<br/>\n'.format(60 * "=") - - self.contents.setHtml(html) - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') - self.__processOutputLine(s) - - def __processOutputLine(self, line): - """ - Private method to process the lines of output. - - @param line output line to be processed (string) - """ - if line == "@@@\n": - self.logEntries.append(self.lastLogEntry) - self.lastLogEntry = {} - self.fileCopies = {} - else: - try: - key, value = line.split("|", 1) - except ValueError: - key = "" - value = line - if key == "change": - self.endInitialText = True - if key in ("change", "tags", "parents", "user", "date", - "file_copies", "file_adds", "files_mods", "file_dels", - "bookmarks", "phase"): - self.lastLogEntry[key] = value.strip() - elif key == "branches": - if value.strip(): - self.lastLogEntry[key] = value.strip() - else: - self.lastLogEntry[key] = "default" - elif key == "description": - self.lastLogEntry[key] = [value.strip()] - else: - if self.endInitialText: - self.lastLogEntry["description"].append(value.strip()) - else: - self.initialText.append(value) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1, v2 = ver.split('_') - if v1 == "" or v2 == "": - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.hgSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .HgDiffDialog import HgDiffDialog - self.diff = HgDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], self.bundle) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the hg process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgLogDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to select revisions. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_HgMultiRevisionSelectionDialog import \ - Ui_HgMultiRevisionSelectionDialog - - -class HgMultiRevisionSelectionDialog( - QDialog, Ui_HgMultiRevisionSelectionDialog): - """ - Class implementing a dialog to select revisions. - """ - def __init__(self, tagsList, branchesList, bookmarksList=None, - emptyRevsOk=False, showLimit=False, limitDefault=100, - parent=None): - """ - Constructor - - @param tagsList list of tags (list of strings) - @param branchesList list of branches (list of strings) - @param bookmarksList list of bookmarks (list of strings) - @param emptyRevsOk flag indicating that it is ok to not enter - revisions (boolean) - @param showLimit flag indicating to show the limit entry (boolean) - @param limitDefault default value for the limit (integer) - @param parent parent widget (QWidget) - """ - super(HgMultiRevisionSelectionDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - self.__emptyRevsOk = emptyRevsOk - - self.tagCombo.addItems(sorted(tagsList)) - self.branchCombo.addItems(["default"] + sorted(branchesList)) - if bookmarksList is not None: - self.bookmarkCombo.addItems(sorted(bookmarksList)) - else: - self.bookmarkButton.setHidden(True) - self.bookmarkCombo.setHidden(True) - - self.limitSpinBox.setValue(limitDefault) - self.limitGroup.setVisible(showLimit) - - def __updateOK(self): - """ - Private slot to update the OK button. - """ - enabled = True - if self.changesetsButton.isChecked(): - enabled = self.changesetsEdit.toPlainText() != "" - elif self.tagButton.isChecked(): - enabled = self.tagCombo.currentText() != "" - elif self.branchButton.isChecked(): - enabled = self.branchCombo.currentText() != "" - elif self.bookmarkButton.isChecked(): - enabled = self.bookmarkCombo.currentText() != "" - if not enabled and self.__emptyRevsOk: - enabled = self.limitGroup.isChecked() - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) - - @pyqtSlot(bool) - def on_changesetsButton_toggled(self, checked): - """ - Private slot to handle changes of the Changesets select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_tagButton_toggled(self, checked): - """ - Private slot to handle changes of the Tag select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_branchButton_toggled(self, checked): - """ - Private slot to handle changes of the Branch select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_bookmarkButton_toggled(self, checked): - """ - Private slot to handle changes of the Bookmark select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot() - def on_changesetsEdit_textChanged(self): - """ - Private slot to handle changes of the Changesets edit. - """ - self.__updateOK() - - @pyqtSlot(str) - def on_tagCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Tag combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_branchCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Branch combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(str) - def on_bookmarkCombo_editTextChanged(self, txt): - """ - Private slot to handle changes of the Bookmark combo. - - @param txt text of the combo (string) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_limitGroup_toggled(self, checked): - """ - Private slot to handle changes of the Limit Results group status. - - @param checked state of the group (boolean) - """ - self.__updateOK() - - def getRevisions(self): - """ - Public method to retrieve the selected revisions. - - @return tuple of selected revisions (list of strings) and number - of entries to be shown (integer) - """ - if self.changesetsButton.isChecked(): - revs = self.changesetsEdit.toPlainText().strip().splitlines() - elif self.tagButton.isChecked(): - revs = [self.tagCombo.currentText()] - elif self.branchButton.isChecked(): - revs = [self.branchCombo.currentText()] - elif self.bookmarkButton.isChecked(): - revs = [self.bookmarkCombo.currentText()] - else: - revs = [] - - if self.limitGroup.isChecked(): - limit = self.limitSpinBox.value() - else: - limit = 0 - - return revs, limit
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -314,10 +314,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -547,10 +543,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -260,21 +260,6 @@ self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'mercurial_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.hgLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -1444,7 +1429,6 @@ menu.addMenu(branchesMenu) menu.addMenu(bookmarksMenu) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.hgLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -1505,7 +1489,6 @@ toolbarManager.addAction(self.vcsCommitAct, title) toolbarManager.addAction(self.hgPushAct, title) toolbarManager.addAction(self.hgPushForcedAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.hgExtDiffAct, title) toolbarManager.addAction(self.hgSummaryAct, title) toolbarManager.addAction(self.vcsRevertAct, title)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Jan 28 19:21:31 2017 +0100 @@ -828,39 +828,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Mercurial repository. - - @param name file/directory name to show the log of (string) - """ - dname, fname = self.splitPath(name) - isFile = os.path.isfile(name) - - # find the root of the repo - repodir = dname - while not os.path.isdir(os.path.join(repodir, self.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - from .HgMultiRevisionSelectionDialog import \ - HgMultiRevisionSelectionDialog - dlg = HgMultiRevisionSelectionDialog( - self.hgGetTagsList(repodir), - self.hgGetBranchesList(repodir), - self.hgGetBookmarksList(repodir), - emptyRevsOk=True, - showLimit=True, - limitDefault=self.getPlugin().getPreferences("LogLimit")) - if dlg.exec_() == QDialog.Accepted: - revs, noEntries = dlg.getRevisions() - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, isFile=isFile) - self.log.show() - self.log.start(name, noEntries=noEntries, revisions=revs) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the @@ -1938,19 +1905,13 @@ @param name file/directory name to show the log of (string) """ - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserIncoming is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserIncoming = HgLogBrowserDialog( - self, mode="incoming") - self.logBrowserIncoming.show() - self.logBrowserIncoming.raise_() - self.logBrowserIncoming.start(name) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="incoming") - self.log.show() - self.log.start(name) + if self.logBrowserIncoming is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserIncoming = HgLogBrowserDialog( + self, mode="incoming") + self.logBrowserIncoming.show() + self.logBrowserIncoming.raise_() + self.logBrowserIncoming.start(name) def hgOutgoing(self, name): """ @@ -1959,19 +1920,13 @@ @param name file/directory name to show the log of (string) """ - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserOutgoing is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserOutgoing = HgLogBrowserDialog( - self, mode="outgoing") - self.logBrowserOutgoing.show() - self.logBrowserOutgoing.raise_() - self.logBrowserOutgoing.start(name) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="outgoing") - self.log.show() - self.log.start(name) + if self.logBrowserOutgoing is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserOutgoing = HgLogBrowserDialog( + self, mode="outgoing") + self.logBrowserOutgoing.show() + self.logBrowserOutgoing.raise_() + self.logBrowserOutgoing.start(name) def hgPull(self, name): """ @@ -2651,19 +2606,13 @@ if file: self.__lastChangeGroupPath = os.path.dirname(file) - if self.getPlugin().getPreferences("UseLogBrowser"): - if self.logBrowserIncoming is None: - from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserIncoming = \ - HgLogBrowserDialog(self, mode="incoming") - self.logBrowserIncoming.show() - self.logBrowserIncoming.raise_() - self.logBrowserIncoming.start(name, bundle=file) - else: - from .HgLogDialog import HgLogDialog - self.log = HgLogDialog(self, mode="incoming", bundle=file) - self.log.show() - self.log.start(name) + if self.logBrowserIncoming is None: + from .HgLogBrowserDialog import HgLogBrowserDialog + self.logBrowserIncoming = \ + HgLogBrowserDialog(self, mode="incoming") + self.logBrowserIncoming.show() + self.logBrowserIncoming.raise_() + self.logBrowserIncoming.start(name, bundle=file) def hgUnbundle(self, name): """
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -254,10 +254,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -566,10 +562,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -96,21 +96,6 @@ self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'pysvn_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -526,7 +511,6 @@ else: menu.addAction(self.svnListAct) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -588,7 +572,6 @@ toolbarManager.addToolBar(self.__toolbar, title) toolbarManager.addAction(self.vcsUpdateAct, title) toolbarManager.addAction(self.vcsCommitAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.svnExtDiffAct, title) toolbarManager.addAction(self.svnUrlDiffAct, title) toolbarManager.addAction(self.svnChangeListsAct, title)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the svn log command process. -""" - -from __future__ import unicode_literals - -import os -import sys - -import pysvn - -from PyQt5.QtCore import QMutexLocker, QUrl, Qt, QByteArray, qVersion -from PyQt5.QtGui import QCursor, QTextCursor -from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox - -from .SvnUtilities import formatTime - -from .SvnDialogMixin import SvnDialogMixin -from .Ui_SvnLogDialog import Ui_SvnLogDialog - -import Utilities - - -class SvnLogDialog(QWidget, SvnDialogMixin, Ui_SvnLogDialog): - """ - Class implementing a dialog to show the output of the svn log command. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. - """ - def __init__(self, vcs, isFile=False, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(SvnLogDialog, self).__init__(parent) - self.setupUi(self) - SvnDialogMixin.__init__(self) - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - - self.vcs = vcs - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.flags = { - 'A': self.tr('Added'), - 'D': self.tr('Deleted'), - 'M': self.tr('Modified') - } - - self.revString = self.tr('revision') - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - self.client = self.vcs.getClient() - self.client.callback_cancel = \ - self._clientCancelCallback - self.client.callback_get_login = \ - self._clientLoginCallback - self.client.callback_ssl_server_trust_prompt = \ - self._clientSslServerTrustPromptCallback - - def start(self, fn, noEntries=0): - """ - Public slot to start the svn log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - """ - self.errorGroup.hide() - - fetchLimit = 10 - - QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) - QApplication.processEvents() - - self.filename = fn - dname, fname = self.vcs.splitPath(fn) - - opts = self.vcs.options['global'] + self.vcs.options['log'] - verbose = "--verbose" in opts - - self.activateWindow() - self.raise_() - - locker = QMutexLocker(self.vcs.vcsExecutionMutex) - cwd = os.getcwd() - os.chdir(dname) - try: - nextRev = 0 - fetched = 0 - logs = [] - limit = noEntries or 9999999 - while fetched < limit: - flimit = min(fetchLimit, limit - fetched) - if fetched == 0: - revstart = pysvn.Revision(pysvn.opt_revision_kind.head) - else: - revstart = pysvn.Revision( - pysvn.opt_revision_kind.number, nextRev) - allLogs = self.client.log(fname, - revision_start=revstart, - discover_changed_paths=verbose, - limit=flimit + 1, - strict_node_history=False) - if len(allLogs) <= flimit or self._clientCancelCallback(): - logs.extend(allLogs) - break - else: - logs.extend(allLogs[:-1]) - nextRev = allLogs[-1]["revision"].number - fetched += fetchLimit - locker.unlock() - - self.contents.clear() - self.__pegRev = None - for log in logs: - ver = "{0:d}".format(log["revision"].number) - dstr = '<b>{0} {1}</b>'.format(self.revString, ver) - if self.__pegRev is None: - self.__pegRev = int(ver) - try: - lv = "{0:d}".format( - logs[logs.index(log) + 1]["revision"].number) - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = lv + '_' + ver - url.setQuery(query) - else: - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(lv) - ) - except IndexError: - pass - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - author = log["author"] - message = log["message"] - if sys.version_info[0] == 2: - author = author.decode('utf-8') - message = message.decode('utf-8') - dstr = self.tr('<i>author: {0}</i><br />\n')\ - .format(author) - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>date: {0}</i><br />\n')\ - .format(formatTime(log["date"])) - self.contents.insertHtml(dstr) - - self.contents.insertHtml('<br />\n') - - for line in message.splitlines(): - self.contents.insertHtml(Utilities.html_encode(line)) - self.contents.insertHtml('<br />\n') - - if len(log['changed_paths']) > 0: - self.contents.insertHtml('<br />\n') - for changeInfo in log['changed_paths']: - action = changeInfo["action"] - path = changeInfo["path"] - if sys.version_info[0] == 2: - action = action.decode('utf-8') - path = path.decode('utf-8') - dstr = '{0} {1}'.format(self.flags[action], path) - if changeInfo["copyfrom_path"] is not None: - copyfrom_path = changeInfo["copyfrom_path"] - if sys.version_info[0] == 2: - copyfrom_path = copyfrom_path.decode('utf-8') - dstr += self.tr( - " (copied from {0}, revision {1})")\ - .format(copyfrom_path, - changeInfo["copyfrom_revision"].number) - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - self.contents.insertHtml('<hr /><br />\n') - except pysvn.ClientError as e: - locker.unlock() - self.__showError(e.args[0]) - os.chdir(cwd) - self.__finish() - - def __finish(self): - """ - Private slot called when the user pressed the button. - """ - QApplication.restoreOverrideCursor() - - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - self._cancel() - - def on_buttonBox_clicked(self, button): - """ - Private slot called by a button of the button box clicked. - - @param button button that was clicked (QAbstractButton) - """ - if button == self.buttonBox.button(QDialogButtonBox.Close): - self.close() - elif button == self.buttonBox.button(QDialogButtonBox.Cancel): - self.__finish() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - self.contents.setSource(QUrl('')) - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1 = ver.split('_')[0] - v2 = ver.split('_')[1] - if not v1 or not v2: - return - try: - v1 = int(v1) - v2 = int(v2) - except ValueError: - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], pegRev=self.__pegRev) - - def __showError(self, msg): - """ - Private slot to show an error message. - - @param msg error message to show (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(msg) - self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Jan 28 19:21:31 2017 +0100 @@ -967,27 +967,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - isFile = os.path.isfile(name) - noEntries, ok = QInputDialog.getInt( - None, - self.tr("Subversion Log"), - self.tr("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self, isFile=isFile) - self.log.show() - self.log.raise_() - QApplication.processEvents() - self.log.start(name, noEntries) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -252,10 +252,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() @@ -565,10 +561,6 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log'), self._VCSLog) - self.vcsDirMenuActions.append(act) - act = menu.addAction( - UI.PixmapCache.getIcon("vcsLog.png"), self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -96,21 +96,6 @@ self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - self.vcsLogAct = E5Action( - self.tr('Show log'), - UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show &log'), - 0, 0, self, 'subversion_log') - self.vcsLogAct.setStatusTip(self.tr( - 'Show the log of the local project' - )) - self.vcsLogAct.setWhatsThis(self.tr( - """<b>Show log</b>""" - """<p>This shows the log of the local project.</p>""" - )) - self.vcsLogAct.triggered.connect(self._vcsLog) - self.actions.append(self.vcsLogAct) - self.svnLogBrowserAct = E5Action( self.tr('Show log browser'), UI.PixmapCache.getIcon("vcsLog.png"), @@ -511,7 +496,6 @@ else: menu.addAction(self.svnListAct) menu.addSeparator() - menu.addAction(self.vcsLogAct) menu.addAction(self.svnLogBrowserAct) menu.addSeparator() menu.addAction(self.vcsStatusAct) @@ -572,7 +556,6 @@ toolbarManager.addToolBar(self.__toolbar, title) toolbarManager.addAction(self.vcsUpdateAct, title) toolbarManager.addAction(self.vcsCommitAct, title) - toolbarManager.addAction(self.vcsLogAct, title) toolbarManager.addAction(self.svnExtDiffAct, title) toolbarManager.addAction(self.svnUrlDiffAct, title) toolbarManager.addAction(self.svnChangeListsAct, title)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sat Jan 28 18:04:14 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,348 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the svn log command process. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot, qVersion, \ - QByteArray -from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox - -from E5Gui import E5MessageBox - -from .Ui_SvnLogDialog import Ui_SvnLogDialog - -import Utilities -import Preferences - - -class SvnLogDialog(QWidget, Ui_SvnLogDialog): - """ - Class implementing a dialog to show the output of the svn log command - process. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. - """ - def __init__(self, vcs, isFile=False, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(SvnLogDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.rx_sep = QRegExp('\\-+\\s*') - self.rx_sep2 = QRegExp('=+\\s*') - self.rx_rev = QRegExp( - 'rev ([0-9]+): ([^|]*) \| ([^|]*) \| ([0-9]+) .*') - # "rev" followed by one or more decimals followed by a colon followed - # anything up to " | " (twice) followed by one or more decimals - # followed by anything - self.rx_rev2 = QRegExp( - 'r([0-9]+) \| ([^|]*) \| ([^|]*) \| ([0-9]+) .*') - # "r" followed by one or more decimals followed by " | " followed - # anything up to " | " (twice) followed by one or more decimals - # followed by anything - self.rx_flags = QRegExp(' ([ADM])( .*)\\s*') - # three blanks followed by A or D or M - self.rx_changed = QRegExp('Changed .*\\s*') - - self.flags = { - 'A': self.tr('Added'), - 'D': self.tr('Deleted'), - 'M': self.tr('Modified') - } - - self.revisions = [] # stack of remembered revisions - self.revString = self.tr('revision') - - self.buf = [] # buffer for stdout - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, fn, noEntries=0): - """ - Public slot to start the cvs log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.intercept = False - self.filename = fn - self.dname, self.fname = self.vcs.splitPath(fn) - - self.process.kill() - - args = [] - args.append('log') - self.vcs.addArguments(args, self.vcs.options['global']) - self.vcs.addArguments(args, self.vcs.options['log']) - if noEntries: - args.append('--limit') - args.append(str(noEntries)) - self.activateWindow() - self.raise_() - args.append(self.fname) - - self.process.setWorkingDirectory(self.dname) - - self.process.start('svn', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('svn')) - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.contents.clear() - - lvers = 1 - for s in self.buf: - rev_match = False - if self.rx_rev.exactMatch(s): - ver = self.rx_rev.cap(1) - author = self.rx_rev.cap(2) - date = self.rx_rev.cap(3) - # number of lines is ignored - rev_match = True - elif self.rx_rev2.exactMatch(s): - ver = self.rx_rev2.cap(1) - author = self.rx_rev2.cap(2) - date = self.rx_rev2.cap(3) - # number of lines is ignored - rev_match = True - - if rev_match: - dstr = '<b>{0} {1}</b>'.format(self.revString, ver) - try: - lv = self.revisions[lvers] - lvers += 1 - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = lv + '_' + ver - url.setQuery(query) - else: - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(lv), - ) - except IndexError: - pass - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>author: {0}</i><br />\n').format(author) - self.contents.insertHtml(dstr) - - dstr = self.tr('<i>date: {0}</i><br />\n').format(date) - self.contents.insertHtml(dstr) - - elif self.rx_sep.exactMatch(s) or self.rx_sep2.exactMatch(s): - self.contents.insertHtml('<hr />\n') - - elif self.rx_flags.exactMatch(s): - dstr = self.flags[self.rx_flags.cap(1)] - dstr += self.rx_flags.cap(2) - dstr += '<br />\n' - self.contents.insertHtml(dstr) - - elif self.rx_changed.exactMatch(s): - dstr = '<br />{0}<br />\n'.format(s) - self.contents.insertHtml(dstr) - - else: - if s == "": - s = self.contents.insertHtml('<br />\n') - else: - self.contents.insertHtml(Utilities.html_encode(s)) - self.contents.insertHtml('<br />\n') - - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), - 'replace') - self.buf.append(line) - if self.rx_rev.exactMatch(line): - ver = self.rx_rev.cap(1) - # save revision number for later use - self.revisions.append(ver) - elif self.rx_rev2.exactMatch(line): - ver = self.rx_rev2.cap(1) - # save revision number for later use - self.revisions.append(ver) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), - 'replace') - self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - self.contents.setSource(QUrl('')) - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1 = ver.split('_')[0] - v2 = ver.split('_')[1] - if v1 == "" or v2 == "": - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.svnSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .SvnDiffDialog import SvnDiffDialog - self.diff = SvnDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2]) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the subversion process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(SvnLogDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Jan 28 18:04:14 2017 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Jan 28 19:21:31 2017 +0100 @@ -887,26 +887,6 @@ project.removeFile(name) return res - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory from the - Subversion repository. - - @param name file/directory name to show the log of (string) - """ - isFile = os.path.isfile(name) - noEntries, ok = QInputDialog.getInt( - None, - self.tr("Subversion Log"), - self.tr("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: - from .SvnLogDialog import SvnLogDialog - self.log = SvnLogDialog(self, isFile=isFile) - self.log.show() - self.log.raise_() - self.log.start(name, noEntries) - def vcsDiff(self, name): """ Public method used to view the difference of a file/directory to the
--- a/VCS/ProjectBrowserHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/VCS/ProjectBrowserHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -311,12 +311,8 @@ Protected slot called by the context menu to show the VCS log of a file/directory. """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - except AttributeError: - fn = itm.dirName() - self.vcs.vcsLog(fn) + # kept for backward compatibility for plug-ins + self._VCSLogBrowser() def _VCSLogBrowser(self): """
--- a/VCS/ProjectHelper.py Sat Jan 28 18:04:14 2017 +0100 +++ b/VCS/ProjectHelper.py Sat Jan 28 19:21:31 2017 +0100 @@ -488,7 +488,8 @@ """ Protected slot used to show the log of the local project. """ - self.vcs.vcsLog(self.project.ppath) + # kept for backward compatibility for plug-ins + self._vcsLogBrowser() def _vcsLogBrowser(self): """
--- a/VCS/VersionControl.py Sat Jan 28 18:04:14 2017 +0100 +++ b/VCS/VersionControl.py Sat Jan 28 19:21:31 2017 +0100 @@ -244,16 +244,6 @@ """ raise RuntimeError('Not implemented') - def vcsLog(self, name): - """ - Public method used to view the log of a file/directory in the vcs. - - @param name file/directory name to show the log for (string) - @exception RuntimeError to indicate that this method must be - implemented by a subclass - """ - raise RuntimeError('Not implemented') - def vcsLogBrowser(self, name, isFile=False): """ Public method used to view the log of a file/directory in the vcs
--- a/eric6.e4p Sat Jan 28 18:04:14 2017 +0100 +++ b/eric6.e4p Sat Jan 28 19:21:31 2017 +0100 @@ -558,9 +558,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py</Source> @@ -644,7 +642,6 @@ <Source>Plugins/VcsPlugins/vcsPySvn/SvnDiffHighlighter.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py</Source> @@ -678,7 +675,6 @@ <Source>Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py</Source> <Source>Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py</Source> @@ -1959,14 +1955,14 @@ <Interfaces/> <Others> <Other>.hgignore</Other> + <Other>APIs/Python/zope-2.10.7.api</Other> + <Other>APIs/Python/zope-2.11.2.api</Other> + <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/Python3/PyQt4.bas</Other> <Other>APIs/Python3/PyQt5.bas</Other> <Other>APIs/Python3/QScintilla2.bas</Other> <Other>APIs/Python3/eric6.api</Other> <Other>APIs/Python3/eric6.bas</Other> - <Other>APIs/Python/zope-2.10.7.api</Other> - <Other>APIs/Python/zope-2.11.2.api</Other> - <Other>APIs/Python/zope-3.3.1.api</Other> <Other>APIs/QSS/qss.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.api</Other> <Other>APIs/Ruby/Ruby-1.8.7.bas</Other> @@ -1980,7 +1976,6 @@ <Other>Dictionaries</Other> <Other>Documentation/Help</Other> <Other>Documentation/Source</Other> - <Other>Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html</Other> <Other>Documentation/eric6-plugin.odt</Other> <Other>Documentation/eric6-plugin.pdf</Other> <Other>Documentation/mod_python.odt</Other>
--- a/i18n/eric6_cs.ts Sat Jan 28 18:04:14 2017 +0100 +++ b/i18n/eric6_cs.ts Sat Jan 28 19:21:31 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation>Přidat záložku</translation> </message> @@ -1797,7 +1797,7 @@ <translation>Editovat &adresu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation>&Smazat</translation> </message> @@ -2490,12 +2490,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation type="unfinished"></translation> </message> @@ -2661,7 +2661,7 @@ <translation>Stisknutím zrušit sdílený editor</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation>Vyčistit</translation> </message> @@ -2959,7 +2959,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> @@ -4900,7 +4900,7 @@ <translation type="unfinished">Doména:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7666,7 +7666,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> @@ -8136,92 +8136,92 @@ <translation type="unfinished">Standardní tlačítka</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation type="unfinished">Přerušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation type="unfinished">Použít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation type="unfinished">Zrušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation type="unfinished">Zavřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation type="unfinished">Zahodit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation type="unfinished">Ignorovat</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation type="unfinished">Ne</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation type="unfinished">Ne pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation type="unfinished">Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation type="unfinished">Otevřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation type="unfinished">Obnovit defaulty</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation type="unfinished">Vrátit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation type="unfinished">Uložit vše</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation type="unfinished">Ano</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation type="unfinished">Ano pro všechno</translation> </message> @@ -10231,7 +10231,7 @@ <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation>Přidat z instalovaných API</translation> </message> @@ -10241,7 +10241,7 @@ <translation>Stiskněte pro kompilování vybrané API definici</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation>Kompilovat API</translation> </message> @@ -10306,7 +10306,7 @@ <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation>Přidat z API pluginů</translation> </message> @@ -11413,7 +11413,7 @@ <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> </message> @@ -11458,7 +11458,7 @@ <translation>Vybrat font.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation></translation> </message> @@ -12929,7 +12929,7 @@ <translation>Mód:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation>Vypnuto</translation> </message> @@ -13723,7 +13723,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation>Odeslat hlášení o chybách</translation> </message> @@ -15203,12 +15203,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation type="unfinished"></translation> </message> @@ -15223,7 +15223,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation type="unfinished"></translation> </message> @@ -16367,7 +16367,7 @@ <translation type="unfinished">Jméno:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16377,7 +16377,7 @@ <translation type="unfinished">Velikost:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> @@ -16412,7 +16412,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> @@ -16838,7 +16838,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation type="unfinished"></translation> </message> @@ -22102,7 +22102,7 @@ <translation type="obsolete">hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -22157,147 +22157,147 @@ <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <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="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <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="2275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <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="2423"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> <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="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <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="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> <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="2304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <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="2810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> <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="2606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <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="2864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> <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="2623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <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="2891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -22307,72 +22307,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -22387,157 +22387,157 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22545,7 +22545,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> @@ -23720,7 +23720,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -23730,7 +23730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -24354,7 +24354,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> @@ -24726,7 +24726,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -24867,7 +24867,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -24897,17 +24897,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -25473,110 +25473,98 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="64"/> <source><b>Processing your request, please wait...</b></source> - <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> + <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="74"/> <source>Revision</source> - <translation>Revize</translation> + <translation type="obsolete">Revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="215"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>No log available for '{0}'</source> - <translation>Log není pro '{0}' dostupný</translation> + <translation type="obsolete">Log není pro '{0}' dostupný</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> - <translation>diff na {0}</translation> + <translation type="obsolete">diff na {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="358"/> <source>Tags: {0}<br /> </source> - <translation>Tagy: {0}<br/></translation> + <translation type="obsolete">Tagy: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="364"/> <source>Parents: {0}<br /> </source> - <translation>Rodiče: {0}<br/></translation> + <translation type="obsolete">Rodiče: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> <source><i>Author: {0}</i><br /> </source> - <translation><i>Autor: {0}</i><br /></translation> + <translation type="obsolete"><i>Autor: {0}</i><br /></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="371"/> <source><i>Date: {0}, {1}</i><br /> </source> - <translation><i>Datum: {0}, {1}</i><br /></translation> + <translation type="obsolete"><i>Datum: {0}, {1}</i><br /></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="387"/> <source>Added {0}<br /> </source> - <translation>Přidáno: {0}<br/></translation> + <translation type="obsolete">Přidáno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="393"/> <source>Modified {0}<br /> </source> - <translation>Změněno: {0}<br/></translation> + <translation type="obsolete">Změněno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="399"/> <source>Deleted {0}<br /> </source> - <translation>Smazáno: {0}<br/></translation> + <translation type="obsolete">Smazáno: {0}<br/></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> <source>The hg process did not finish within 30s.</source> - <translation>Hg proces neskončil do 30s.</translation> + <translation type="obsolete">Hg proces neskončil do 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>Could not start the hg executable.</source> - <translation>Nelze spustit hg program.</translation> + <translation type="obsolete">Nelze spustit hg program.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> <source>Mercurial Error</source> - <translation>Mercurial chyba</translation> + <translation type="obsolete">Mercurial chyba</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="382"/> <source>Added {0} (copied from {1})<br /> </source> - <translation>Přidáno {0} (zkopírováno z {1})<br /> + <translation type="obsolete">Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> - <source>Bookmarks: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> - <source>Phase: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> @@ -25586,12 +25574,6 @@ <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> - <source>Branch: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgMergeDialog</name> @@ -25969,87 +25951,87 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <translation type="obsolete">Zobrazit log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="544"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="343"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="663"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> <source>Move</source> <translation type="unfinished"></translation> </message> @@ -26059,42 +26041,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="329"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="643"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="656"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="672"/> <source>Configure...</source> <translation type="unfinished">Konfigurovat...</translation> </message> @@ -26243,581 +26225,566 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> - <source>Show &log</source> - <translation>Zobrazit &log</translation> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> - <source>Show the log of the local project</source> - <translation>Zobrazit log lokálního projektu</translation> + <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="271"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <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="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <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="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <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="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <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="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <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="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <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="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <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="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <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="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <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="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <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="378"/> + <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="385"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> - <source>Show the tip of the repository</source> - <translation>Zobrazí ukazatel tip repozitáře</translation> + <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="393"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> + <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="400"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> + <source>Merge</source> + <translation>Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> + <source>Mer&ge changes...</source> + <translation>&Sloučit změny...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> - <source>Revert all changes made to the local project</source> - <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <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="408"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Merge</source> - <translation>Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> - <source>Mer&ge changes...</source> - <translation>&Sloučit změny...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Merge changes of a revision into the local project</source> - <translation>Sloučí změny revize do lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>Tag in repository</source> + <translation>Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <source>&Tag in repository...</source> + <translation>Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Tag the local project in the repository</source> + <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>Tag in repository</source> - <translation>Vytvořit tag v repozitáři</translation> + <source>List tags</source> + <translation>Seznam tagů</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>&Tag in repository...</source> - <translation>Vytvořit &tag v repozitáři...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> - <source>Tag the local project in the repository</source> - <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Create &branch...</source> + <translation>Narou&bovat větev...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> + <source>Create a new branch for the local project in the repository</source> + <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> - <source><b>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="550"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Create &branch...</source> - <translation>Narou&bovat větev...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Create a new branch for the local project in the repository</source> - <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <source>Switch the working directory to another revision</source> + <translation>Přepnout pracovní adresář do jiné revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Switch the working directory to another revision</source> - <translation>Přepnout pracovní adresář do jiné revize</translation> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Spustit libovolný Mercurial příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> + <source>Configure</source> + <translation>Konfigurovat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <source>Configure...</source> + <translation>Konfigurovat...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Spustit libovolný Mercurial příkaz</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="647"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure</source> - <translation>Konfigurovat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create a .hgignore file with default values</source> + <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <source>Create changegroup...</source> + <translation>Vytvořit skupinu změn...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Create a .hgignore file with default values</source> - <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + <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="1793"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <source>Apply changegroups...</source> + <translation>Použít skupinu změn...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <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="1309"/> + <source>Changegroup Management</source> + <translation>Správa skupin změn</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> - <source>Create changegroup...</source> - <translation>Vytvořit skupinu změn...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> - <source>Create changegroup file collecting changesets</source> - <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1810"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> - <source>Apply changegroups...</source> - <translation>Použít skupinu změn...</translation> + <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="810"/> + <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="581"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show the current branch of the project</source> + <translation>Zobrazit aktuální větev projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> - <source>Apply one or several changegroup files</source> - <translation>Použít soubory s jednou nebo více skupinami změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> - <source>Changegroup Management</source> - <translation>Správa skupin změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> - <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> + <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="825"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> - <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> - <source>Show the current branch of the project</source> - <translation>Zobrazit aktuální větev projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> - <source>Mark a selectable changeset as good</source> - <translation>Označit volitelnou množinu změn, že je v pořádku</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <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="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <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="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> <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="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <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="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <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> @@ -26837,687 +26804,687 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <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="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> <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="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Edit repository configuration...</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Export Patches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> - <source>Change the phase of revisions</source> + <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> - <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1906"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1921"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Add</source> + <translation type="unfinished">Přidat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <source>Add...</source> + <translation type="unfinished">Přidat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add</source> - <translation type="unfinished">Přidat</translation> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Add...</source> - <translation type="unfinished">Přidat...</translation> + <source>Remove...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Add a sub-repository</source> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1036"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="342"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <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="1290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks</source> + <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>List bookmarks...</source> + <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>List bookmarks of the project</source> + <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark</source> + <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Define bookmark...</source> + <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Define a bookmark for the project</source> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark</source> + <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Delete bookmark...</source> + <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Delete a bookmark of the project</source> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Rename bookmark...</source> + <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Rename a bookmark of the project</source> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <source>Manage Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> @@ -28864,7 +28831,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Status</source> <translation>Mercurial status</translation> </message> @@ -29005,7 +28972,7 @@ <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> @@ -29125,7 +29092,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -30405,7 +30372,7 @@ <translation>Stisknout pro odebrání vybraných položek</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation>Odeb&rat</translation> </message> @@ -36305,107 +36272,102 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> <source>Incoming / Outgoing</source> - <translation>Příchozí / Odchozí</translation> + <translation type="obsolete">Příchozí / Odchozí</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="242"/> - <source>Select to show the incoming and outgoing log in a log browser dialog</source> - <translation>Vybrat pro zobrazení příchozích a odchozích logů v prohlížeči logů</translation> + <source>Select to update the working directory to new tip</source> + <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> <source>Use Log Browser for incoming / outgoing log</source> - <translation>Použít Log prohlížeč pro příchozí / odchozí logy</translation> + <translation type="obsolete">Použít Log prohlížeč pro příchozí / odchozí logy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="236"/> + <source>Pull</source> + <translation>Stáhnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> + <source>Update after pulling</source> + <translation>Aktualizovat po stažení</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="334"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="337"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="324"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="252"/> + <source>Select to prefer unbundle over pull</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> - <source>Pull</source> - <translation>Stáhnout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/> - <source>Select to update the working directory to new tip</source> - <translation>Zvolte, zda chcete aktualizovat pracovní adresář na nový tip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/> - <source>Update after pulling</source> - <translation>Aktualizovat po stažení</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="353"/> - <source>Edit the Mercurial configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="356"/> - <source>Edit configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/> - <source>Pattern:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="343"/> - <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="271"/> - <source>Select to prefer unbundle over pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="259"/> + <source>Prefer Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="292"/> + <source>Revert</source> + <translation type="unfinished">Vrátit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="298"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> + <source>Create Backup Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="269"/> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="275"/> + <source>Select to enforce usage of the Mercural internal merge tool</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="278"/> - <source>Prefer Unbundle</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="311"/> - <source>Revert</source> - <translation type="unfinished">Vrátit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="317"/> - <source>Select to create a backup file (.orig) before reverting changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="320"/> - <source>Create Backup Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="288"/> - <source>Merge</source> - <translation type="unfinished">Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="294"/> - <source>Select to enforce usage of the Mercural internal merge tool</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> <source><b>Internal Merge Tool</b> <p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="282"/> <source>Use internal merge with conflict markers</source> <translation type="unfinished"></translation> </message> @@ -36581,92 +36543,92 @@ <translation>Standardní tlačítka</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation>Použít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation>Přerušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation>Ignorovat</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation>Uložit vše</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation>Zahodit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation>Ano pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation>Otevřít</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation>Ok</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation>Ne</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation>Ne pro všechno</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation>Vrátit</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation>Obnovit defaulty</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation>Ano</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation>Zavřít</translation> </message> @@ -38426,7 +38388,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation type="unfinished"></translation> </message> @@ -38534,7 +38496,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation type="unfinished"></translation> </message> @@ -39205,7 +39167,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation>Uložená hesla</translation> </message> @@ -44038,7 +44000,7 @@ <translation>Vykonáno</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation>Pokrytí</translation> </message> @@ -44119,7 +44081,7 @@ </translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -44127,7 +44089,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation>Výsledky profilování</translation> </message> @@ -45085,521 +45047,506 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation type="unfinished">Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="99"/> - <source>Show &log</source> - <translation type="unfinished">Zobrazit &log</translation> + <source>Show log browser</source> + <translation type="unfinished">Zobrazit log prohlížeč</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> - <source>Show the log of the local project</source> - <translation type="unfinished">Zobrazit log lokálního projektu</translation> + <source>Show a dialog to browse the log of the local project</source> + <translation type="unfinished">Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> - <translation type="unfinished"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="114"/> - <source>Show log browser</source> - <translation type="unfinished">Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> - <source>Show a dialog to browse the log of the local project</source> - <translation type="unfinished">Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>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/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="116"/> <source>Show &difference</source> <translation type="unfinished">Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="132"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished">Zobrazit odlišnosti v projektu mezi dvěma repozitáři na URL</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="156"/> <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show status</source> + <translation type="unfinished">Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="164"/> + <source>Show &status</source> + <translation type="unfinished">Zobrazit &status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Zobrazit status lokálního projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="172"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show status</source> - <translation type="unfinished">Zobrazit status</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> - <source>Show &status</source> - <translation type="unfinished">Zobrazit &status</translation> + <source>Show change lists</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> - <source>Show the status of the local project</source> - <translation type="unfinished">Zobrazit status lokálního projektu</translation> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="187"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="199"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="202"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="215"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="200"/> <source>Show some repository related information for the local project</source> <translation type="unfinished">Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="203"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>Tag in repository</source> + <translation type="unfinished">Vytvořit tag v repozitáři</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <source>&Tag in repository...</source> + <translation type="unfinished">Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="216"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><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/vcsPySvn/ProjectHelper.py" line="226"/> - <source>Tag in repository</source> - <translation type="unfinished">Vytvořit tag v repozitáři</translation> + <source>Export from repository</source> + <translation type="unfinished">Exportovat z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> - <source>&Tag in repository...</source> - <translation type="unfinished">Vytvořit &tag v repozitáři...</translation> + <source>&Export from repository...</source> + <translation type="unfinished">&Exportovat z repozitáře...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="231"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + <source>Export a project from the repository</source> + <translation type="unfinished">Export projekt z repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>Export from repository</source> - <translation type="unfinished">Exportovat z repozitáře</translation> + <source>Command options</source> + <translation type="unfinished">Parametry příkazu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> - <source>&Export from repository...</source> - <translation type="unfinished">&Exportovat z repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="246"/> - <source>Export a project from the repository</source> - <translation type="unfinished">Export projekt z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> - <source>Command options</source> - <translation type="unfinished">Parametry příkazu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="256"/> <source>Command &options...</source> <translation type="unfinished">&Parametry příkazu...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Show the VCS command options</source> <translation type="unfinished">Zobrazit parametry VCS příkazu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation type="unfinished"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Revert changes</source> + <translation type="unfinished">Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="254"/> + <source>Re&vert changes</source> + <translation type="unfinished">&Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation type="unfinished"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><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/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Revert changes</source> - <translation type="unfinished">Vrátit změny</translation> + <source>Merge</source> + <translation type="unfinished">Sloučit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="269"/> - <source>Re&vert changes</source> - <translation type="unfinished">&Vrátit změny</translation> + <source>Mer&ge changes...</source> + <translation type="unfinished">&Sloučit změny...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> - <source>Revert all changes made to the local project</source> - <translation type="unfinished">Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> + <source>Merge changes of a tag/revision into the local project</source> + <translation type="unfinished">Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> - <translation type="unfinished"><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/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Merge</source> - <translation type="unfinished">Sloučit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="284"/> - <source>Mer&ge changes...</source> - <translation type="unfinished">&Sloučit změny...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="289"/> - <source>Merge changes of a tag/revision into the local project</source> - <translation type="unfinished">Sloučit změny tagu/revize do lokálního projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>Switch</source> + <translation type="unfinished">Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="285"/> + <source>S&witch...</source> + <translation type="unfinished">&Přepnout...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Switch the local copy to another tag/branch</source> + <translation type="unfinished">Přepnout lokální kopii do jiného tagu/větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> + <translation type="unfinished"><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Switch</source> - <translation type="unfinished">Přepnout</translation> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>S&witch...</source> - <translation type="unfinished">&Přepnout...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Switch the local copy to another tag/branch</source> - <translation type="unfinished">Přepnout lokální kopii do jiného tagu/větve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> - <translation type="unfinished"><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Conflicts resolved</source> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="304"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="307"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> - <source>Con&flicts resolved</source> + <source>Cleanup</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Vyčistit lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="322"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanup</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="330"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="337"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute command</source> <translation type="unfinished">Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>E&xecute command...</source> <translation type="unfinished">P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="333"/> <source>Execute an arbitrary VCS command</source> <translation type="unfinished">Provede se libovolný VCS příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="336"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags</source> <translation type="unfinished">Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="343"/> <source>List tags...</source> <translation type="unfinished">Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <source>List tags of the project</source> <translation type="unfinished">Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="350"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches</source> <translation type="unfinished">Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches...</source> <translation type="unfinished">Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="361"/> <source>List branches of the project</source> <translation type="unfinished">Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="364"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents</source> <translation type="unfinished">Seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source>List repository contents...</source> <translation type="unfinished">Seznam obsahu repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="375"/> <source>Lists the contents of the repository</source> <translation type="unfinished">Vypisuje seznam obsahu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property</source> <translation type="unfinished">Nastavit vlastnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="385"/> <source>Set Property...</source> <translation type="unfinished">Nastavit vlastnosti...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="389"/> <source>Set a property for the project files</source> <translation type="unfinished">Nastaví vlastnosti souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="392"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties</source> <translation type="unfinished">Seznam vlastností</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="414"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <source>List Properties...</source> <translation type="unfinished">Seznam vlastností...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="403"/> <source>List properties of the project files</source> <translation type="unfinished">Seznam vlastností souborů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property</source> <translation type="unfinished">Smazat vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="413"/> <source>Delete Property...</source> <translation type="unfinished">Smazat vlastnost...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <source>Delete a property for the project files</source> + <translation type="unfinished">Smaže vlastnost pro soubory projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="420"/> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate</source> + <translation type="unfinished">Přemístit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="427"/> + <source>Relocate...</source> + <translation type="unfinished">Přemístit...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> - <source>Delete a property for the project files</source> - <translation type="unfinished">Smaže vlastnost pro soubory projektu</translation> + <source>Relocate the working copy to a new repository URL</source> + <translation type="unfinished">Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate</source> - <translation type="unfinished">Přemístit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="442"/> - <source>Relocate...</source> - <translation type="unfinished">Přemístit...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Relocate the working copy to a new repository URL</source> - <translation type="unfinished">Přemístit pracovní kopii do nového URL repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser</source> + <translation type="unfinished">Prohlížeč repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="443"/> + <source>Repository Browser...</source> + <translation type="unfinished">Prohlížeč repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished">Zobrazit dialog prohlížeče repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser</source> - <translation type="unfinished">Prohlížeč repozitáře</translation> + <source>Configure</source> + <translation type="unfinished">Konfigurovat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="458"/> - <source>Repository Browser...</source> - <translation type="unfinished">Prohlížeč repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> - <source>Show the Repository Browser dialog</source> - <translation type="unfinished">Zobrazit dialog prohlížeče repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="462"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation type="unfinished">Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="465"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation type="unfinished"><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure</source> - <translation type="unfinished">Konfigurovat</translation> + <source>Upgrade</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="473"/> - <source>Configure...</source> - <translation type="unfinished">Konfigurovat...</translation> + <source>Upgrade...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="477"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished">Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> + <source>Upgrade the working copy to the current format</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="480"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation type="unfinished"><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="488"/> - <source>Upgrade...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="492"/> - <source>Upgrade the working copy to the current format</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="495"/> <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="559"/> <source>Subversion (pysvn)</source> <translation type="unfinished">Subversion (pysvn)</translation> </message> @@ -48833,7 +48780,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation type="unfinished"></translation> </message> @@ -48843,7 +48790,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation type="unfinished"></translation> </message> @@ -50324,7 +50271,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -51526,7 +51473,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation type="unfinished"></translation> </message> @@ -53243,107 +53190,102 @@ <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="951"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="978"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1056"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1093"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1073"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1100"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1492"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1684"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1664"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1779"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1759"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1781"/> + <source>You have to supply a property name. Aborting.</source> + <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1801"/> - <source>You have to supply a property name. Aborting.</source> - <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1821"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1791"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1771"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> - <source>Subversion Log</source> - <translation></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="900"/> <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/vcsSubversion/subversion.py" line="2100"/> + <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2080"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2108"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1944"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1923"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1976"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2247"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2133"/> <source>Relocating</source> <translation></translation> </message> @@ -53498,7 +53440,7 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1984"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1964"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> @@ -53508,27 +53450,27 @@ <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2150"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2241"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2221"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2220"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2200"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -53558,27 +53500,27 @@ <translation>Přesun {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1033"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1013"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1131"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1196"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1482"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1462"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1695"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -53594,7 +53536,7 @@ <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1234"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -53610,37 +53552,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1042"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1050"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1987"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1967"/> <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/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source>Subversion Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2028"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="2285"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -54239,7 +54181,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation></translation> </message> @@ -54516,12 +54458,12 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation>Autor</translation> </message> @@ -54531,7 +54473,7 @@ <translation>Datum</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -54806,61 +54748,61 @@ <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="55"/> <source><b>Processing your request, please wait...</b></source> - <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> + <translation type="obsolete"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="81"/> <source>Added</source> - <translation>Přidáno</translation> + <translation type="obsolete">Přidáno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="82"/> <source>Deleted</source> - <translation>Smazáno</translation> + <translation type="obsolete">Smazáno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="83"/> <source>Modified</source> - <translation>Změněno</translation> + <translation type="obsolete">Změněno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="87"/> <source>revision</source> - <translation>revize</translation> + <translation type="obsolete">revize</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>Process Generation Error</source> - <translation>Chyba v procesu generování</translation> + <translation type="obsolete">Chyba v procesu generování</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="142"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> - <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="193"/> <source>diff to {0}</source> - <translation>diff na {0}</translation> + <translation type="obsolete">diff na {0}</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="202"/> <source><i>author: {0}</i><br /> </source> - <translation><i>Autor: {0}</i><br /> + <translation type="obsolete"><i>Autor: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="205"/> <source><i>date: {0}</i><br /> </source> - <translation><i>datum: {0}</i><br /> + <translation type="obsolete"><i>datum: {0}</i><br /> </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="191"/> <source> (copied from {0}, revision {1})</source> - <translation> (zkopírováno z {0}, revize {1})</translation> + <translation type="obsolete"> (zkopírováno z {0}, revize {1})</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="42"/> @@ -55013,7 +54955,7 @@ <translation>Prot&otokol:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55125,7 +55067,7 @@ <translation>Výběr protokolu pro přístup do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55179,177 +55121,177 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="634"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="646"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="650"/> <source>Commit changes to repository...</source> <translation>Commitovat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="664"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="656"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="381"/> <source>Add tree to repository</source> <translation>Přidat stromovou strukturu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="660"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="566"/> <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="684"/> + <translation type="obsolete">Zobrazit log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="676"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="286"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="696"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="700"/> + <source>Merge changes</source> + <translation>Sloučit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="430"/> + <source>Lock</source> + <translation>Zamknout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> + <source>Unlock</source> + <translation>Odemknout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> + <source>Break Lock</source> + <translation>Prolomit zámek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> + <source>Steal Lock</source> + <translation>Scizit zámek</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="708"/> - <source>Merge changes</source> - <translation>Sloučit změny</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="434"/> - <source>Lock</source> - <translation>Zamknout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="438"/> - <source>Unlock</source> - <translation>Odemknout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="442"/> - <source>Break Lock</source> - <translation>Prolomit zámek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="446"/> - <source>Steal Lock</source> - <translation>Scizit zámek</translation> + <source>Set Property</source> + <translation>Nastavit vlastnosti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="710"/> + <source>List Properties</source> + <translation>Seznam vlastností</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="713"/> + <source>Delete Property</source> + <translation>Smazat vlastnost</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="716"/> - <source>Set Property</source> - <translation>Nastavit vlastnosti</translation> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="718"/> - <source>List Properties</source> - <translation>Seznam vlastností</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="721"/> - <source>Delete Property</source> - <translation>Smazat vlastnost</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="724"/> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="726"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="720"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="730"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="722"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="572"/> <source>Show repository info</source> <translation>Zobrazit info o repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="562"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="733"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="725"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="667"/> <source>Add to Changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="671"/> <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="547"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="549"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="681"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="267"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="685"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="276"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="690"/> <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py" line="704"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> @@ -55418,336 +55360,331 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py" line="99"/> - <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/Proj